Ticket #11764: 11764.patch

django/db/models/sql/compiler.py

@@ -546 +546 @@
                     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 Wholesaler(Supplier):
+    retailer = models.ForeignKey(Supplier,related_name='wholesale_supplier')
+
 class Parent(models.Model):
     created = models.DateTimeField(default=datetime.datetime.now)
 
@@ -268 +271 @@
 >>> Supplier.objects.filter(restaurant=Restaurant(name='xx', address='yy'))
 []
 
+# Regression test for #11764.
+>>> for w in Wholesaler.objects.all().select_related():
+...     print w
+
 # Regression test for #7853
 # If the parent class has a self-referential link, make sure that any updates
 # to that link via the child update the right table.