Fixed #9572 -- use `opts` argument. Thanks SeanL for bug report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
8370e7ca87
commit
4058429708
|
@ -122,7 +122,7 @@ class GeoQuery(sql.Query):
|
||||||
table_alias = start_alias
|
table_alias = start_alias
|
||||||
else:
|
else:
|
||||||
table_alias = self.tables[0]
|
table_alias = self.tables[0]
|
||||||
root_pk = self.model._meta.pk.column
|
root_pk = opts.pk.column
|
||||||
seen = {None: table_alias}
|
seen = {None: table_alias}
|
||||||
aliases = set()
|
aliases = set()
|
||||||
for field, model in opts.get_fields_with_model():
|
for field, model in opts.get_fields_with_model():
|
||||||
|
|
|
@ -11,3 +11,12 @@ class City(models.Model):
|
||||||
state = USStateField()
|
state = USStateField()
|
||||||
location = models.ForeignKey(Location)
|
location = models.ForeignKey(Location)
|
||||||
objects = models.GeoManager()
|
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()
|
||||||
|
|
|
@ -2,7 +2,7 @@ import os, unittest
|
||||||
from django.contrib.gis.geos import *
|
from django.contrib.gis.geos import *
|
||||||
from django.contrib.gis.tests.utils import no_mysql, postgis
|
from django.contrib.gis.tests.utils import no_mysql, postgis
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from models import City, Location
|
from models import City, Location, DirectoryEntry
|
||||||
|
|
||||||
cities = (('Aurora', 'TX', -97.516111, 33.058333),
|
cities = (('Aurora', 'TX', -97.516111, 33.058333),
|
||||||
('Roswell', 'NM', -104.528056, 33.387222),
|
('Roswell', 'NM', -104.528056, 33.387222),
|
||||||
|
@ -89,6 +89,11 @@ class RelatedGeoModelTest(unittest.TestCase):
|
||||||
u2 = City.objects.exclude(name='Roswell').unionagg(field_name='location__point')
|
u2 = City.objects.exclude(name='Roswell').unionagg(field_name='location__point')
|
||||||
self.assertEqual(ref_u1, u1)
|
self.assertEqual(ref_u1, u1)
|
||||||
self.assertEqual(ref_u2, u2)
|
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.
|
# TODO: Related tests for KML, GML, and distance lookups.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue