Ticket #10977: 10977.diff

django/db/models/sql/query.py

@@ -455 +455 @@
             if not rhs.alias_refcount[alias]:
                 # An unused alias.
                 continue
+            lhs_alias = rhs.alias_map[alias][LHS_ALIAS]
+            aux = (change_map.get(lhs_alias, lhs_alias),) + rhs.rev_join_map[alias][1:]
             promote = (rhs.alias_map[alias][JOIN_TYPE] == self.LOUTER)
-            new_alias = self.join(rhs.rev_join_map[alias],
+            new_alias = self.join(aux,
                     (conjunction and not first), used, promote, not conjunction)
             used.add(new_alias)
             change_map[alias] = new_alias

tests/regressiontests/queries/models.py

@@ -294 +294 @@
 
     def __unicode__(self):
         return u"%s" % self.num
+
+# Models for #10977
+
+# A base class for Sponsor and Team
+class Brand(models.Model):
+    pass
+
+class Mark(models.Model):
+    brand = models.ForeignKey(Brand)
+    name = models.CharField(max_length=20)
+
+class Sponsor(Brand):
+    pass
+
+class Team(Brand):
+    name = models.CharField(max_length=20)
+    sponsor = models.ForeignKey(Sponsor)
+
+    def __unicode__(self):
+        return self.name

tests/regressiontests/queries/tests.py

@@ -14 +14 @@
 from models import (Annotation, Article, Author, Celebrity, Child, Cover, Detail,
     DumbCategory, ExtraInfo, Fan, Item, LeafA, LoopX, LoopZ, ManagedModel,
     Member, NamedCategory, Note, Number, Plaything, PointerA, Ranking, Related,
-    Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten, Node)
+    Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten, Node,
+    Sponsor, Team, Mark)
 
 
 class BaseQuerysetTest(TestCase):
@@ -1658 +1659 @@
             Number.objects.filter(num__in=numbers).count(),
             2500
         )
+
+
+class QuerysetIntersectionTests(TestCase):
+    """
+    Tests for merging querysets that have been filtered on multiple elements
+    from the same base class
+    """
+
+    def test_models_with_same_parent(self):
+        s1 = Sponsor.objects.create()
+        s2 = Sponsor.objects.create()
+        Team.objects.create(sponsor=s1, name='Team A')
+        Team.objects.create(sponsor=s2, name='Team B')
+        Mark.objects.create(name='Product A', brand=s1)
+
+        qs1 = Team.objects.all()
+
+        qs2 = Team.objects.filter(
+            Q(sponsor__mark__name='Product A') |
+            Q(sponsor__mark__name='Product A')
+        )
+        r = qs1 & qs2
+        self.assertQuerysetEqual(r, ['<Team: Team A>'])