Ticket #12823: 12823_1.1.diff

Django-1.1.2//django/db/models/sql/query.py

@@ -1945 +1945 @@
         query.bump_prefix()
         query.clear_ordering(True)
         query.set_start(prefix)
-        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

Django-1.1.2//tests/regressiontests/queries/models.py

@@ -291 +291 @@
 >>> t4 = Tag.objects.create(name='t4', parent=t3)
 >>> t5 = Tag.objects.create(name='t5', parent=t3)
 
->>> n1 = Note.objects.create(note='n1', misc='foo')
->>> n2 = Note.objects.create(note='n2', misc='bar')
->>> n3 = Note.objects.create(note='n3', misc='foo')
+>>> n1 = Note.objects.create(id=1, note='n1', misc='foo')
+>>> n2 = Note.objects.create(id=2, note='n2', misc='bar')
+>>> n3 = Note.objects.create(id=3, note='n3', misc='foo')
 
->>> ann1 = Annotation.objects.create(name='a1', tag=t1)
+>>> ann1 = Annotation.objects.create(id=10, name='a1', tag=t1)
 >>> ann1.notes.add(n1)
->>> ann2 = Annotation.objects.create(name='a2', tag=t4)
+>>> ann2 = Annotation.objects.create(id=11, name='a2', tag=t4)
 >>> ann2.notes.add(n2, n3)
 
 Create these out of order so that sorting by 'id' will be different to sorting
 by 'info'. Helps detect some problems later.
->>> e2 = ExtraInfo.objects.create(info='e2', note=n2)
->>> e1 = ExtraInfo.objects.create(info='e1', note=n1)
+>>> e2 = ExtraInfo.objects.create(id=20, info='e2', note=n2)
+>>> e1 = ExtraInfo.objects.create(id=21, info='e1', note=n1)
 
->>> a1 = Author.objects.create(name='a1', num=1001, extra=e1)
->>> a2 = Author.objects.create(name='a2', num=2002, extra=e1)
->>> a3 = Author.objects.create(name='a3', num=3003, extra=e2)
->>> a4 = Author.objects.create(name='a4', num=4004, extra=e2)
+>>> a1 = Author.objects.create(id=31, name='a1', num=1001, extra=e1)
+>>> a2 = Author.objects.create(id=32, name='a2', num=2002, extra=e1)
+>>> a3 = Author.objects.create(id=33, name='a3', num=3003, extra=e2)
+>>> a4 = Author.objects.create(id=34, name='a4', num=4004, extra=e2)
 
 >>> time1 = datetime.datetime(2007, 12, 19, 22, 25, 0)
 >>> time2 = datetime.datetime(2007, 12, 19, 21, 0, 0)
@@ -684 +684 @@
 # An empty values() call includes all aliases, including those from an extra()
 >>> dicts = qs.values().order_by('id')
 >>> [sorted(d.items()) for d in dicts]
-[[('author_id', 2), ('good', 0), ('id', 1), ('rank', 2)], [('author_id', 3), ('good', 0), ('id', 2), ('rank', 1)], [('author_id', 1), ('good', 1), ('id', 3), ('rank', 3)]]
+[[('author_id', 32), ('good', 0), ('id', 1), ('rank', 2)], [('author_id', 33), ('good', 0), ('id', 2), ('rank', 1)], [('author_id', 31), ('good', 1), ('id', 3), ('rank', 3)]]
 
 Bugs #2874, #3002
 >>> qs = Item.objects.select_related().order_by('note__note', 'name')
@@ -1233 +1233 @@
 >>> subq._result_cache is None
 True
 
+# Regression test for #12823
+>>> qs = Author.objects.exclude(extra__note__annotation__name ='a2')
+>>> len(qs)
+2
 """}
 
 # In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__