Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #9572 -- use `opts` argument. Thanks SeanL for bug report and p…

…atch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4058429708da7380385a28959ba10a51cda7f05a 1 parent 8370e7c
@jbronn jbronn authored
View
2  django/contrib/gis/db/models/sql/query.py
@@ -122,7 +122,7 @@ def get_default_columns(self, with_aliases=False, col_aliases=None,
table_alias = start_alias
else:
table_alias = self.tables[0]
- root_pk = self.model._meta.pk.column
+ root_pk = opts.pk.column
seen = {None: table_alias}
aliases = set()
for field, model in opts.get_fields_with_model():
View
9 django/contrib/gis/tests/relatedapp/models.py
@@ -11,3 +11,12 @@ class City(models.Model):
state = USStateField()
location = models.ForeignKey(Location)
objects = models.GeoManager()
+
+class AugmentedLocation(Location):
+ extra_text = models.TextField(blank=True)
+ objects = models.GeoManager()
+
+class DirectoryEntry(models.Model):
+ listing_text = models.CharField(max_length=50)
+ location = models.ForeignKey(AugmentedLocation)
+ objects = models.GeoManager()
View
7 django/contrib/gis/tests/relatedapp/tests.py
@@ -2,7 +2,7 @@
from django.contrib.gis.geos import *
from django.contrib.gis.tests.utils import no_mysql, postgis
from django.conf import settings
-from models import City, Location
+from models import City, Location, DirectoryEntry
cities = (('Aurora', 'TX', -97.516111, 33.058333),
('Roswell', 'NM', -104.528056, 33.387222),
@@ -89,6 +89,11 @@ def test04_related_aggregate(self):
u2 = City.objects.exclude(name='Roswell').unionagg(field_name='location__point')
self.assertEqual(ref_u1, u1)
self.assertEqual(ref_u2, u2)
+
+ def test05_select_related_fk_to_subclass(self):
+ "Testing that calling select_related on a query over a model with an FK to a model subclass works"
+ # Regression test for #9752.
+ l = list(DirectoryEntry.objects.all().select_related())
# TODO: Related tests for KML, GML, and distance lookups.
Please sign in to comment.
Something went wrong with that request. Please try again.