Ticket #14876: 14876.r16622.diff

django/db/models/sql/query.py

@@ -1102 +1102 @@
                 table = table_it.next()
                 if join == table and self.alias_refcount[join] > 1:
                     continue
-                join_promote = self.promote_alias(join)
+                join_promote = self.promote_alias(join, unconditional=True)
                 if table != join:
                     table_promote = self.promote_alias(table)
                 break

tests/regressiontests/queries/tests.py

@@ -966 +966 @@
         Report.objects.create(name='r2', creator=a3)
         Report.objects.create(name='r3')
 
+    def test_ticket14876(self):
+        q1 = Report.objects.filter(Q(creator__isnull=True) | Q(creator__extra__info='e1'))
+        q2 = Report.objects.filter(Q(creator__isnull=True)) | Report.objects.filter(Q(creator__extra__info='e1'))
+        self.assertQuerysetEqual(q1, list(q2), lambda x: x)
+
     def test_ticket7095(self):
         # Updates that are filtered on the model being updated are somewhat
         # tricky in MySQL. This exercises that case.