Fixed #13882 -- Removed an unnecessary nested where clause introduced on __isnull queries. Thanks to Alex Gaynor for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
de81c5513c
commit
c4e766c100
|
@ -1090,10 +1090,7 @@ class Query(object):
|
||||||
# exclude the "foo__in=[]" case from this handling, because
|
# exclude the "foo__in=[]" case from this handling, because
|
||||||
# it's short-circuited in the Where class.
|
# it's short-circuited in the Where class.
|
||||||
# We also need to handle the case where a subquery is provided
|
# We also need to handle the case where a subquery is provided
|
||||||
entry = self.where_class()
|
self.where.add((Constraint(alias, col, None), 'isnull', False), AND)
|
||||||
entry.add((Constraint(alias, col, None), 'isnull', True), AND)
|
|
||||||
entry.negate()
|
|
||||||
self.where.add(entry, AND)
|
|
||||||
|
|
||||||
if can_reuse is not None:
|
if can_reuse is not None:
|
||||||
can_reuse.update(join_list)
|
can_reuse.update(join_list)
|
||||||
|
|
Loading…
Reference in New Issue