diff options
| -rw-r--r-- | django/contrib/gis/db/models/sql/compiler.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/subqueries.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py index 55dc4a66ec..dea0fd3e83 100644 --- a/django/contrib/gis/db/models/sql/compiler.py +++ b/django/contrib/gis/db/models/sql/compiler.py @@ -56,7 +56,7 @@ class GeoSQLCompiler(compiler.SQLCompiler): col_aliases.add(col[1]) else: result.append(col.as_sql(qn, self.connection)) - + if hasattr(col, 'alias'): aliases.add(col.alias) col_aliases.add(col.alias) diff --git a/django/db/models/sql/subqueries.py b/django/db/models/sql/subqueries.py index 197e4a612d..a0bdc94a2c 100644 --- a/django/db/models/sql/subqueries.py +++ b/django/db/models/sql/subqueries.py @@ -194,7 +194,7 @@ class DateQuery(Query): alias = result[3][-1] select = Date((alias, field.column), lookup_type) self.select = [select] - self.select_fields = [] + self.select_fields = [None] self.select_related = False # See #7097. self.set_extra_mask([]) self.distinct = True |