Commit 5e485a15 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #13815 -- Ensure that reverse exclude lookups on nullable... 

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

Backport of r15458 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent bbfdb36b

django/db/models/sql/query.py

+7 −0
Original line number Diff line number Diff line
@@ -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)

tests/regressiontests/null_queries/tests.py

+12 −0
Original line number Diff line number Diff line
@@ -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>']

        )