Fix bug introduced in contrib.gis in 74f3884

django · May 15, 2013 · 3188775 · 3188775
1 parent 74f3884
commit 3188775
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
@@ -121,7 +121,7 @@ def get_default_columns(self, with_aliases=False, col_aliases=None,
         """
         result = []
         if opts is None:
-            opts = self.get_meta()
+            opts = self.query.get_meta()
         aliases = set()
         only_load = self.deferred_to_columns()
         seen = self.query.included_inherited_models.copy()
@@ -247,7 +247,7 @@ def _field_column(self, field, table_alias=None, column=None):
         used.  If `column` is specified, it will be used instead of the value
         in `field.column`.
         """
-        if table_alias is None: table_alias = self.get_meta().db_table
+        if table_alias is None: table_alias = self.query.get_meta().db_table
         return "%s.%s" % (self.quote_name_unless_alias(table_alias),
                           self.connection.ops.quote_name(column or field.column))