summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorDaniel Wiesmann <daniel.wiesmann@gmail.com>2016-08-15 18:18:48 +0100
committerTim Graham <timograham@gmail.com>2016-08-15 14:23:48 -0400
commit201198136da354541aed2e571168d343b55ac356 (patch)
treefa661452afc82c08a2610a0e6721695e2d56afaa /django
parent7d11d61087479c45d7cb23cbdfc32a47d84cdc05 (diff)
[1.10.x] Fixed #27014 -- Fixed annotations with database functions on PostGIS.
Thanks Sean Mc Allister for providing a test. Backport of 89f17e7caf0d1e70417253d135607c9fd6ebac56 from master
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/db/backends/postgis/adapter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/gis/db/backends/postgis/adapter.py b/django/contrib/gis/db/backends/postgis/adapter.py
index 2d2d9578ec..9e107db6d6 100644
--- a/django/contrib/gis/db/backends/postgis/adapter.py
+++ b/django/contrib/gis/db/backends/postgis/adapter.py
@@ -15,7 +15,7 @@ class PostGISAdapter(object):
"""
Initialize on the spatial object.
"""
- self.is_geometry = isinstance(obj, Geometry)
+ self.is_geometry = isinstance(obj, (Geometry, PostGISAdapter))
# Getting the WKB (in string form, to allow easy pickling of
# the adaptor) and the SRID from the geometry or raster.