summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2009-12-24 15:07:53 +0000
committerJustin Bronn <jbronn@gmail.com>2009-12-24 15:07:53 +0000
commit9b8e90f93796b18ca43dcfbf3bfe3267157d322f (patch)
treeb4139e76179bdde50febbeadf3013601e33d1dc6
parent474fb8c3ae9edd2c26ce5dd3e6c57db7c61976ed (diff)
Yes, Virginia, `ST_MakeLine` really exists in PostGIS 1.3 and above.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/gis/db/backends/postgis/operations.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py
index 722d6e21fb..98dab75270 100644
--- a/django/contrib/gis/db/backends/postgis/operations.py
+++ b/django/contrib/gis/db/backends/postgis/operations.py
@@ -199,9 +199,11 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
if version < (1, 3, 0):
UNIONAGG = 'GeomUnion'
UNION = 'Union'
+ MAKELINE = False
else:
UNIONAGG = 'ST_Union'
UNION = 'ST_Union'
+ MAKELINE = 'ST_MakeLine'
# Only PostGIS versions 1.3.4+ have GeoJSON serialization support.
if version < (1, 3, 4):
@@ -212,11 +214,10 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
# ST_ContainsProperly ST_MakeLine, and ST_GeoHash added in 1.4.
if version >= (1, 4, 0):
GEOHASH = 'ST_GeoHash'
- MAKELINE = 'ST_MakeLine'
BOUNDINGCIRCLE = 'ST_MinimumBoundingCircle'
self.geometry_functions['contains_properly'] = PostGISFunction(prefix, 'ContainsProperly')
else:
- GEOHASH, MAKELINE, BOUNDINGCIRCLE = False, False, False
+ GEOHASH, BOUNDINGCIRCLE = False, False
# Geography type support added in 1.5.
if version >= (1, 5, 0):