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

Merge pull request #1070 from mfogel/ticket_20413 

Fix bug introduced in contrib.gis in 74f3884ae0
This commit is contained in:
Alex Gaynor 2013-05-15 15:03:53 -07:00
parent c0c3b65de9 3188775174
commit 63f6ee817e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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))