Ticket #11764: 11764.diff

django/db/models/sql/query.py

@@ -1397 +1397 @@
                     lhs_col = int_opts.parents[int_model].column
                     dedupe = lhs_col in opts.duplicate_targets
                     if dedupe:
-                        avoid.update(self.dupe_avoidance.get(id(opts), lhs_col),
-                                ())
+                        avoid.update(self.dupe_avoidance.get((id(opts), lhs_col),
+                              ()))
                         dupe_set.add((opts, lhs_col))
                     int_opts = int_model._meta
                     alias = self.join((alias, int_opts.db_table, lhs_col,

tests/regressiontests/model_inheritance_regress/models.py

@@ -55 +55 @@
 
 class Supplier(models.Model):
     restaurant = models.ForeignKey(Restaurant)
+
+class WholesaleSupplier(Supplier):
+    owned_retailer = models.ForeignKey(Supplier, related_name='partner_supplier')
 
 class Parent(models.Model):
     created = models.DateTimeField(default=datetime.datetime.now)
@@ -318 +321 @@
 >>> ParkingLot3._meta.get_ancestor_link(Place).name  # the child->parent link
 "parent"
 
+# Regression tests for #11764
+
+>>> qs = WholesaleSupplier.objects.all()
+>>> qs = qs.select_related()
+>>> for x in qs:
+...     print x
+
 """}