Ticket #15316: ticket15316.diff

AUTHORS

@@ -443 +443 @@
     schwank@gmail.com
     scott@staplefish.com
     Ilya Semenov <semenov@inetss.com>
+    Aleksandra Sendecka <asendecka@hauru.eu>
     serbaut@gmail.com
     John Shaffer <jshaffer2112@gmail.com>
     Pete Shinners <pete@shinners.org>

django/db/models/sql/query.py

@@ -1075 +1075 @@
                     can_reuse)
             return
 
-        if (lookup_type == 'isnull' and value is True and not negate and
+        if (lookup_type == 'isnull' and not negate and
                 len(join_list) > 1):
             # If the comparison is against NULL, we may need to use some left
             # outer joins when creating the join chain. This is only done when

tests/regressiontests/queries/models.py

@@ -12 +12 @@
 class NamedCategory(DumbCategory):
     name = models.CharField(max_length=10)
 
+class SimpleCategory(models.Model):
+    name = models.CharField(max_length=10)
+
+    def __unicode__(self):
+        return self.name
+
+class SpecialCategory(SimpleCategory):
+    special_name = models.CharField(max_length=10)
+
+    def __unicode__(self):
+        return self.name + " " + self.special_name
+
 class Tag(models.Model):
     name = models.CharField(max_length=10)
     parent = models.ForeignKey('self', blank=True, null=True,
@@ -24 +36 @@
     def __unicode__(self):
         return self.name
 
+class CategoryItem(models.Model):
+    category = models.ForeignKey(SimpleCategory)
+
+    def __unicode__(self):
+        return "category item: " + str(self.category)
+
 class Note(models.Model):
     note = models.CharField(max_length=100)
     misc = models.CharField(max_length=10)

tests/regressiontests/queries/tests.py

@@ -15 +15 @@
     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, ObjectA, ObjectB,
-    ObjectC)
+    ObjectC, CategoryItem, SimpleCategory, SpecialCategory)
 
 
 class BaseQuerysetTest(TestCase):
@@ -1032 +1032 @@
             []
         )
 
+    def test_ticket15316_filter_false(self):
+        c1 = SimpleCategory(name="category1")
+        c2 = SpecialCategory(name="named category1", special_name="special1")
+        c3 = SpecialCategory(name="named category2", special_name="special2")
+        c1.save()
+        c2.save()
+        c3.save()
 
+        ci1 = CategoryItem(category=c1)
+        ci2 = CategoryItem(category=c2)
+        ci3 = CategoryItem(category=c3)
+        ci1.save()
+        ci2.save()
+        ci3.save()
+
+        self.assertEqual(
+            CategoryItem.objects.filter(category__specialcategory__isnull=False).count(),
+            2
+        )
+
+        self.assertItemsEqual(
+            CategoryItem.objects.filter(category__specialcategory__isnull=False),
+            CategoryItem.objects.filter(pk__in=[ci2.pk, ci3.pk])
+        )
+
+    def test_ticket15316_exclude_false(self):
+        c1 = SimpleCategory(name="category1")
+        c2 = SpecialCategory(name="named category1", special_name="special1")
+        c3 = SpecialCategory(name="named category2", special_name="special2")
+        c1.save()
+        c2.save()
+        c3.save()
+
+        ci1 = CategoryItem(category=c1)
+        ci2 = CategoryItem(category=c2)
+        ci3 = CategoryItem(category=c3)
+        ci1.save()
+        ci2.save()
+        ci3.save()
+
+        self.assertEqual(
+            CategoryItem.objects.exclude(category__specialcategory__isnull=False).count(),
+            1
+        )
+
+        self.assertItemsEqual(
+            CategoryItem.objects.exclude(category__specialcategory__isnull=False),
+            CategoryItem.objects.filter(pk__in=[ci1.pk])
+        )
+
+    def test_ticket15316_filter_true(self):
+        c1 = SimpleCategory(name="category1")
+        c2 = SpecialCategory(name="named category1", special_name="special1")
+        c3 = SpecialCategory(name="named category2", special_name="special2")
+        c1.save()
+        c2.save()
+        c3.save()
+
+        ci1 = CategoryItem(category=c1)
+        ci2 = CategoryItem(category=c2)
+        ci3 = CategoryItem(category=c3)
+        ci1.save()
+        ci2.save()
+        ci3.save()
+
+        self.assertEqual(
+            CategoryItem.objects.filter(category__specialcategory__isnull=True).count(),
+            1
+        )
+
+        self.assertItemsEqual(
+            CategoryItem.objects.filter(category__specialcategory__isnull=True),
+            CategoryItem.objects.filter(pk__in=[ci1.pk])
+        )
+
+    def test_ticket15316_exclude_true(self):
+        c1 = SimpleCategory(name="category1")
+        c2 = SpecialCategory(name="named category1", special_name="special1")
+        c3 = SpecialCategory(name="named category2", special_name="special2")
+        c1.save()
+        c2.save()
+        c3.save()
+
+        ci1 = CategoryItem(category=c1)
+        ci2 = CategoryItem(category=c2)
+        ci3 = CategoryItem(category=c3)
+        ci1.save()
+        ci2.save()
+        ci3.save()
+
+        self.assertEqual(
+            CategoryItem.objects.exclude(category__specialcategory__isnull=True).count(),
+            2
+        )
+
+        self.assertItemsEqual(
+            CategoryItem.objects.exclude(category__specialcategory__isnull=True),
+            CategoryItem.objects.filter(pk__in=[ci2.pk, ci3.pk])
+        )
+
 class Queries5Tests(TestCase):
     def setUp(self):
         # Ordering by 'rank' gives us rank2, rank1, rank3. Ordering by the Meta.ordering