mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed a bug in date queries with GIS backends introduced in [14716]. Backport of [14760].

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-12-01 17:54:06 +00:00
parent 0d6c945622
commit e86e303140
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/models/sql/compiler.py
View File

@ -56,7 +56,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
col_aliases.add(col[1]) col_aliases.add(col[1])
else: else:
result.append(col.as_sql(qn, self.connection)) result.append(col.as_sql(qn, self.connection))
if hasattr(col, 'alias'): if hasattr(col, 'alias'):
aliases.add(col.alias) aliases.add(col.alias)
col_aliases.add(col.alias) col_aliases.add(col.alias)

2
django/db/models/sql/subqueries.py
View File

@ -194,7 +194,7 @@ class DateQuery(Query):
alias = result[3][-1] alias = result[3][-1]
select = Date((alias, field.column), lookup_type) select = Date((alias, field.column), lookup_type)
self.select = [select] self.select = [select]
self.select_fields = [] self.select_fields = [None]
self.select_related = False # See #7097. self.select_related = False # See #7097.
self.set_extra_mask([]) self.set_extra_mask([])
self.distinct = True self.distinct = True