mirror of
https://github.com/django/django.git
synced 2025-10-30 09:06:13 +00:00
Fixed #11082 -- Ensured that subqueries used in an exclude(X__in=) clause aren't pre-evaluated. Thanks to Henry Andrews for the report, and clement for the fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -1625,10 +1625,14 @@ class BaseQuery(object):
|
||||
entry.negate()
|
||||
self.where.add(entry, AND)
|
||||
break
|
||||
elif not (lookup_type == 'in' and not value) and field.null:
|
||||
elif not (lookup_type == 'in'
|
||||
and not hasattr(value, 'as_sql')
|
||||
and not hasattr(value, '_as_sql')
|
||||
and not value) and field.null:
|
||||
# Leaky abstraction artifact: We have to specifically
|
||||
# exclude the "foo__in=[]" case from this handling, because
|
||||
# it's short-circuited in the Where class.
|
||||
# We also need to handle the case where a subquery is provided
|
||||
entry = self.where_class()
|
||||
entry.add((Constraint(alias, col, None), 'isnull', True), AND)
|
||||
entry.negate()
|
||||
|
||||
Reference in New Issue
Block a user