summaryrefslogtreecommitdiff
path: root/django/contrib/gis/db/models/sql
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2009-12-29 10:18:56 +0000
committerJustin Bronn <jbronn@gmail.com>2009-12-29 10:18:56 +0000
commita488589461582d60a41326cd8a6ab28b96a9e19a (patch)
treeec12ac47077db5fe4eafbbbb02e236ec611928a6 /django/contrib/gis/db/models/sql
parent4ab21fbf40f456fc3126e935505af47366c64372 (diff)
Fixed #12344 -- Using `select_related()` on geographic fields with the Oracle spatial backend now works.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/gis/db/models/sql')
-rw-r--r--django/contrib/gis/db/models/sql/compiler.py4
1 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 1a91f8eeba..a94093fec3 100644
--- a/django/contrib/gis/db/models/sql/compiler.py
+++ b/django/contrib/gis/db/models/sql/compiler.py
@@ -191,8 +191,8 @@ class GeoSQLCompiler(compiler.SQLCompiler):
if self.connection.ops.oracle or getattr(self.query, 'geo_values', False):
# We resolve the rest of the columns if we're on Oracle or if
# the `geo_values` attribute is defined.
- for value, field in izip(row[index_start:], fields):
- values.append(self.query.convert_values(value, field, self.connection))
+ for value, field in map(None, row[index_start:], fields):
+ values.append(self.query.convert_values(value, field, connection=self.connection))
else:
values.extend(row[index_start:])
return tuple(values)