Ticket #9752: update-get-default-columns-plus-regression-test-2.patch

django/contrib/gis/db/models/sql/query.py

@@ -122 +122 @@
             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():

django/contrib/gis/tests/relatedapp/tests.py

@@ -2 +2 @@
 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 +89 @@
         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"""
+        # Obscure case, but I found breakage here in my own app so this acts as a regression test for my
+        # patch that fixes it.
+        # without patch this line will throw an exception
+        l = list(DirectoryEntry.objects.all().select_related())
 
     # TODO: Related tests for KML, GML, and distance lookups.
         

django/contrib/gis/tests/relatedapp/models.py

@@ -11 +11 @@
     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()