summaryrefslogtreecommitdiff
path: root/django/contrib/gis/db/models/sql/query.py
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2009-06-29 16:31:21 +0000
committerJustin Bronn <jbronn@gmail.com>2009-06-29 16:31:21 +0000
commitfdcc0c774a9295f5d0fa3a1edd34e4f7e41476d5 (patch)
tree5452bd437a66575dc791cbc51cdef2be9df5eea8 /django/contrib/gis/db/models/sql/query.py
parent735309341e24d53d5af41799a31aa964f424190c (diff)
Fixed #11381 -- `GeoManager` + `select_related` + nullable `ForeignKey` now works correctly. Thanks, bretthoerner for ticket and dgouldin for initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/gis/db/models/sql/query.py')
-rw-r--r--django/contrib/gis/db/models/sql/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py
index cf1ccf6483..5df15a88b1 100644
--- a/django/contrib/gis/db/models/sql/query.py
+++ b/django/contrib/gis/db/models/sql/query.py
@@ -225,7 +225,7 @@ class GeoQuery(sql.Query):
values.append(self.convert_values(value, field))
else:
values.extend(row[index_start:])
- return values
+ return tuple(values)
def convert_values(self, value, field):
"""