Commit 63f6ee81 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Merge pull request #1070 from mfogel/ticket_20413 

Fix bug introduced in contrib.gis in 74f3884a
parents c0c3b65d 31887751

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

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class GeoSQLCompiler(compiler.SQLCompiler): 
        """

        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 @@ class GeoSQLCompiler(compiler.SQLCompiler): 
        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))