Ticket #13579: 13579.patch

django/db/models/sql/where.py

@@ -176 +176 @@
         if lookup_type == 'in':
             if not value_annot:
                 raise EmptyResultSet
-            if extra:
-                return ('%s IN %s' % (field_sql, extra), params)
-            return ('%s IN (%s)' % (field_sql, ', '.join(['%s'] * len(params))),
-                    params)
+            if None in params:
+                params = [param for param in params if param is not None]
+                if extra:
+                    return ('%s IS NULL OR %s IN %s' % (field_sql, field_sql, 
+                                                        extra), params)
+                return ('%s IS NULL OR %s IN (%s)' % 
+                        (field_sql, field_sql, ', '.join(['%s'] * len(params))), 
+                         params)
+            else:
+                if extra:
+                    return ('%s IN %s' % (field_sql, extra), params)
+                return ('%s IN (%s)' % 
+                        (field_sql, ', '.join(['%s'] * len(params))), params)
         elif lookup_type in ('range', 'year'):
             return ('%s BETWEEN %%s and %%s' % field_sql, params)
         elif lookup_type in ('month', 'day', 'week_day'):

tests/regressiontests/null_queries/models.py

@@ -78 +78 @@
 >>> Inner.objects.filter(first__inner__second=None)
 [<Inner: Inner object>]
 
+>>> bobj = OuterB.objects.create(data="")
+>>> _ = Inner.objects.create(first=obj, second=bobj)
+>>> Inner.objects.filter(second__in=[None,]).count()
+1
+>>> Inner.objects.filter(second__in=[None, bobj]).count()
+2
 
 """}