Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.6.x] Fixed #22250 -- regression in gis compiler for non-concrete f…

…ields

Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e from master
  • Loading branch information...
commit 31892af3f03fa75dd59a2f70beebb29993098778 1 parent f659c8e
@akaariai akaariai authored
View
2  django/contrib/gis/db/models/sql/compiler.py
@@ -123,7 +123,7 @@ def get_default_columns(self, with_aliases=False, col_aliases=None,
seen = self.query.included_inherited_models.copy()
if start_alias:
seen[None] = start_alias
- for field, model in opts.get_fields_with_model():
+ for field, model in opts.get_concrete_fields_with_model():
if from_parent and model is not None and issubclass(from_parent, model):
# Avoid loading data for already loaded parents.
continue
View
9 django/contrib/gis/tests/geoapp/tests.py
@@ -777,3 +777,12 @@ def test_unionagg(self):
self.assertEqual(True, union.equals_exact(u2, tol))
qs = City.objects.filter(name='NotACity')
self.assertEqual(None, qs.unionagg(field_name='point'))
+
+ def test_non_concrete_field(self):
+ pkfield = City._meta.get_field_by_name('id')[0]
+ orig_pkfield_col = pkfield.column
+ pkfield.column = None
+ try:
+ list(City.objects.all())
+ finally:
+ pkfield.column = orig_pkfield_col
Please sign in to comment.
Something went wrong with that request. Please try again.