diff options
| -rw-r--r-- | django/db/models/sql/query.py | 7 | ||||
| -rw-r--r-- | tests/regressiontests/null_queries/tests.py | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index f08544d259..0a5e428897 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1474,6 +1474,13 @@ class Query(object): query.bump_prefix() query.clear_ordering(True) query.set_start(prefix) + # Adding extra check to make sure the selected field will not be null + # since we are adding a IN <subquery> clause. This prevents the + # database from tripping over IN (...,NULL,...) selects and returning + # nothing + alias, col = query.select[0] + query.where.add((Constraint(alias, col, None), 'isnull', False), AND) + self.add_filter(('%s__in' % prefix, query), negate=True, trim=True, can_reuse=can_reuse) diff --git a/tests/regressiontests/null_queries/tests.py b/tests/regressiontests/null_queries/tests.py index 72dcd5153c..8392c588e4 100644 --- a/tests/regressiontests/null_queries/tests.py +++ b/tests/regressiontests/null_queries/tests.py @@ -67,3 +67,15 @@ class NullQueriesTests(TestCase): ['<Inner: Inner object>'] ) + # Ticket #13815: check if <reverse>_isnull=False does not produce + # faulty empty lists + objB = OuterB.objects.create(data="reverse") + self.assertQuerysetEqual( + OuterB.objects.filter(inner__isnull=False), + [] + ) + Inner.objects.create(first=obj) + self.assertQuerysetEqual( + OuterB.objects.exclude(inner__isnull=False), + ['<OuterB: OuterB object>'] + ) |