Ticket #12823: 12823_trunk.2.diff

django/db/models/sql/query.py

@@ -1535 +1535 @@
         alias, col = query.select[0]
         query.where.add((Constraint(alias, col, None), 'isnull', False), AND)
 
-        self.add_filter(('%s__in' % prefix, query), negate=True, trim=True,
+        new_prefix = prefix.split(LOOKUP_SEP)[0]
+        self.add_filter(('%s__in' % new_prefix, query), negate=True, trim=True,
                 can_reuse=can_reuse)
 
         # If there's more than one join in the inner query (before any initial
@@ -1548 +1549 @@
         active_positions = [pos for (pos, count) in
                 enumerate(query.alias_refcount.itervalues()) if count]
         if active_positions[-1] > 1:
-            self.add_filter(('%s__isnull' % prefix, False), negate=True,
+            self.add_filter(('%s__isnull' % new_prefix, False), negate=True,
                     trim=True, can_reuse=can_reuse)
 
     def set_limits(self, low=None, high=None):

tests/regressiontests/queries/tests.py

@@ -36 +36 @@
         n2 = Note.objects.create(note='n2', misc='bar', id=2)
         self.n3 = Note.objects.create(note='n3', misc='foo', id=3)
 
-        ann1 = Annotation.objects.create(name='a1', tag=self.t1)
+        ann1 = Annotation.objects.create(name='a1', tag=self.t1, id=11)
         ann1.notes.add(self.n1)
-        ann2 = Annotation.objects.create(name='a2', tag=t4)
+        ann2 = Annotation.objects.create(name='a2', tag=t4, id=12)
         ann2.notes.add(n2, self.n3)
 
         # Create these out of order so that sorting by 'id' will be different to sorting
         # by 'info'. Helps detect some problems later.
-        self.e2 = ExtraInfo.objects.create(info='e2', note=n2)
-        e1 = ExtraInfo.objects.create(info='e1', note=self.n1)
+        self.e2 = ExtraInfo.objects.create(info='e2', note=n2, id=21)
+        e1 = ExtraInfo.objects.create(info='e1', note=self.n1, id=22)
 
         self.a1 = Author.objects.create(name='a1', num=1001, extra=e1)
         self.a2 = Author.objects.create(name='a2', num=2002, extra=e1)
@@ -74 +74 @@
         Cover.objects.create(title="first", item=i4)
         Cover.objects.create(title="second", item=self.i2)
 
+    def test_ticket12823(self):
+        #self.assertEqual(str(Author.objects.exclude(extra__note__annotation__name ='a2').query), "")
+        self.assertQuerysetEqual(
+            Author.objects.exclude(extra__note__annotation__name ='a2'), 
+            ['<Author: a1>', '<Author: a2>']
+        )
+
     def test_ticket1050(self):
         self.assertQuerysetEqual(
             Item.objects.filter(tags__isnull=True),