innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Updated `GeoWhere` to be compatible with changes in r9700. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2009-01-05 22:16:12 +00:00
parent f747b61c20
commit 391736e737
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/gis/db/models/sql/where.py
View File

@ -29,7 +29,10 @@ class GeoWhereNode(WhereNode):
""" """
if not isinstance(data, (list, tuple)): if not isinstance(data, (list, tuple)):
return super(WhereNode, self).add(data, connector) return super(WhereNode, self).add(data, connector)
alias, col, field, lookup_type, value = data
obj, lookup_type, value = data
alias, col, field = obj.alias, obj.col, obj.field
if not hasattr(field, "_geom"): if not hasattr(field, "_geom"):
# Not a geographic field, so call `WhereNode.add`. # Not a geographic field, so call `WhereNode.add`.
return super(GeoWhereNode, self).add(data, connector) return super(GeoWhereNode, self).add(data, connector)
@ -43,18 +46,17 @@ class GeoWhereNode(WhereNode):
# the `get_geo_where_clause` to construct the appropriate # the `get_geo_where_clause` to construct the appropriate
# spatial SQL when `make_atom` is called. # spatial SQL when `make_atom` is called.
annotation = GeoAnnotation(field, value, where) annotation = GeoAnnotation(field, value, where)
return super(WhereNode, self).add((alias, col, field.db_type(), lookup_type, return super(WhereNode, self).add((obj, lookup_type, annotation, params), connector)
annotation, params), connector)
def make_atom(self, child, qn): def make_atom(self, child, qn):
table_alias, name, db_type, lookup_type, value_annot, params = child lvalue, lookup_type, value_annot, params = child
if isinstance(value_annot, GeoAnnotation): if isinstance(value_annot, GeoAnnotation):
if lookup_type in SpatialBackend.gis_terms: if lookup_type in SpatialBackend.gis_terms:
# Getting the geographic where clause; substitution parameters # Getting the geographic where clause; substitution parameters
# will be populated in the GeoFieldSQL object returned by the # will be populated in the GeoFieldSQL object returned by the
# GeometryField. # GeometryField.
gwc = get_geo_where_clause(table_alias, name, lookup_type, value_annot) gwc = get_geo_where_clause(lvalue.alias, lvalue.col, lookup_type, value_annot)
return gwc % value_annot.where, params return gwc % value_annot.where, params
else: else:
raise TypeError('Invalid lookup type: %r' % lookup_type) raise TypeError('Invalid lookup type: %r' % lookup_type)