Ticket #11320: exclude-none-join.diff

django/db/models/sql/query.py

@@ -1627 +1627 @@
                     entry.add((Constraint(alias, col, None), 'isnull', True), AND)
                     entry.negate()
                     self.where.add(entry, AND)
+            elif connector != OR and value:
+                if len(join_list) > 1:
+                    for alias in join_list:
+                        if self.alias_map[alias][JOIN_TYPE] == self.LOUTER:
+                            data = list(self.alias_map[alias])
+                            data[JOIN_TYPE] = self.INNER
+                            self.alias_map[alias] = tuple(data)
+                            break
 
         if can_reuse is not None:
             can_reuse.update(join_list)

tests/regressiontests/queries/models.py

@@ -271 +271 @@
     def __unicode__(self):
         return self.name
 
+class Venue(models.Model):
+    name = models.CharField(max_length=100)
+
+class Event(models.Model):
+    name = models.CharField(max_length=100)
+    venue = models.ForeignKey(Venue, null=True)
+    
+    def __unicode__(self):
+        return self.name
+
 
 __test__ = {'API_TESTS':"""
 >>> generic = NamedCategory.objects.create(name="Generic")
@@ -1143 +1153 @@
 >>> r.save()
 >>> Ranking.objects.all()
 [<Ranking: 3: a1>, <Ranking: 2: a2>, <Ranking: 1: a3>]
+
+>>> v = Venue.objects.create(name="Googleplex")
+>>> _ = Event.objects.create(name="Release Party")
+>>> _ = Event.objects.create(name="DjangCon 2008", venue=v)
+>>> 'LEFT OUTER JOIN' in Event.objects.exclude(venue__name='a').exclude(venue=None).query.as_sql()[0]
+False
 """}
 
 # In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__