Ticket #15316: 15316_with_test.diff

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/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)
 
 
 class BaseQuerysetTest(TestCase):
@@ -1032 +1032 @@
             []
         )
 
+    def test_ticket15316(self):
+       c1 = NamedCategory(name="category1")
+       c2 = DumbCategory()
+       c1.save()
+       c2.save()
 
+       ci1 = CategoryItem(category=c1)
+       ci2 = CategoryItem(category=c2)
+       ci1.save()
+       ci2.save()
+
+       self.assertEqual(
+           CategoryItem.objects.filter(category__namedcategory__isnull=False).count(),
+           1
+       )
+
 class Queries5Tests(TestCase):
     def setUp(self):
         # Ordering by 'rank' gives us rank2, rank1, rank3. Ordering by the Meta.ordering

tests/regressiontests/queries/models.py

@@ -12 +12 @@
 class NamedCategory(DumbCategory):
     name = models.CharField(max_length=10)
 
+class CategoryItem(models.Model):
+   category = models.ForeignKey(DumbCategory)
+
+   def __unicode__(self):
+       return "category item: " + str(self.category)
+
 class Tag(models.Model):
     name = models.CharField(max_length=10)
     parent = models.ForeignKey('self', blank=True, null=True,