Ticket #11764: 11764.2.diff

django/db/models/sql/compiler.py

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

tests/regressiontests/model_inheritance_regress/models.py

@@ -56 +56 @@
 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)
 
@@ -385 +388 @@
 >>> p4.bachelorparty_set.all()
 [<BachelorParty: Bachelor party for Bob>, <BachelorParty: Bachelor party for Dave>]
 
+# Regression tests for #11764
+
+>>> qs = WholesaleSupplier.objects.all()
+>>> qs = qs.select_related()
+>>> for x in qs:
+...     print x
+
 """}