Fixed #13815 -- Ensure that reverse exclude lookups on nullable foreign keys exclude null values. Thanks to bpeschier for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2011-02-08 14:06:02 +00:00
parent 340eaded4e
commit d3b38d578f
2 changed files with 19 additions and 0 deletions

View File

@ -1475,6 +1475,13 @@ class Query(object):
query.bump_prefix() query.bump_prefix()
query.clear_ordering(True) query.clear_ordering(True)
query.set_start(prefix) 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, self.add_filter(('%s__in' % prefix, query), negate=True, trim=True,
can_reuse=can_reuse) can_reuse=can_reuse)

View File

@ -67,3 +67,15 @@ class NullQueriesTests(TestCase):
['<Inner: Inner object>'] ['<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>']
)