Ticket #9394: pk-trace.diff

django/db/models/fields/related.py

@@ -128 +128 @@
             # down until we hit a value that can be used for a comparison.
             v, field = value, None
             try:
-                while True:
-                    v, field = getattr(v, v._meta.pk.name), v._meta.pk
+                v, field = getattr(v, v._meta.pk.attname), v._meta.pk
             except AttributeError:
                 pass
             if field:

tests/regressiontests/model_inheritance_regress/models.py

@@ -267 +267 @@
 >>> fragment.find('pub_date', pos + 1) == -1
 True
 
+>>> from django.conf import settings
+>>> settings.DEBUG = True
+>>> from django.db import connection, reset_queries
+>>> ir = ItalianRestaurant.objects.create(serves_gnocchi=True, serves_pizza=True, serves_hot_dogs=False, name="Django Restaurant")
+>>> _ = Supplier.objects.create(restaurant=ir)
+>>> ir = ItalianRestaurant.objects.get(pk=ir)
+>>> reset_queries()
+>>> connection.queries
+[]
+>>> Supplier.objects.filter(restaurant=ir)
+[<Supplier: Supplier object>]
+>>> len(connection.queries)
+1
+>>> settings.DEBUG = False
 """}