Ticket #10159: geowherenode_expressions_fix.diff

django/contrib/gis/db/models/sql/where.py

@@ -1 +1 @@
 import datetime
+from django.db import connection
 from django.db.models.fields import Field
+from django.db.models.sql.expressions import SQLEvaluator
 from django.db.models.sql.where import WhereNode
 from django.contrib.gis.db.backend import get_geo_where_clause, SpatialBackend
+qn = connection.ops.quote_name
 
 class GeoAnnotation(object):
     """
@@ -37 +40 @@
             # Not a geographic field, so call `WhereNode.add`.
             return super(GeoWhereNode, self).add(data, connector)
         else:
-            # `GeometryField.get_db_prep_lookup` returns a where clause
-            # substitution array in addition to the parameters.
-            where, params = field.get_db_prep_lookup(lookup_type, value)
 
+            if isinstance(value, SQLEvaluator):
+                # If an expression is used, we are getting a database column so 
+                # we we don't send to get_db_prep_lookup.
+                where =  ['%s.%s' % tuple(map(qn, value.cols[value.expression]))]
+                params = ()
+            else:
+                # `GeometryField.get_db_prep_lookup` returns a where clause
+                # substitution array in addition to the parameters.
+                where, params = field.get_db_prep_lookup(lookup_type, value)
+
             # The annotation will be a `GeoAnnotation` object that
             # will contain the necessary geometry field metadata for
             # the `get_geo_where_clause` to construct the appropriate