summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSimon Charette <simon.charette@zapier.com>2019-09-01 14:35:27 -0400
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-09-02 10:52:36 +0200
commit13a8884a08342817094cc6287c7ae346100a297d (patch)
tree11388a363431303cd071da5267f45a47e1e2ecbc /django
parent600628f8f0ab077c62223a54a6c8cde6cbbd1ed1 (diff)
Fixed #30739 -- Fixed exclusion of multi-valued lookup against outer rhs.
OuterRef right hand sides have to be nested, just like F rhs have to, during the subquery pushdown split_exclude performs to ensure they are resolved against the outer query aliases.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/sql/query.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 35f3c5e1ea..8e55bd092d 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1702,7 +1702,9 @@ class Query(BaseExpression):
handle.
"""
filter_lhs, filter_rhs = filter_expr
- if isinstance(filter_rhs, F):
+ if isinstance(filter_rhs, OuterRef):
+ filter_expr = (filter_lhs, OuterRef(filter_rhs))
+ elif isinstance(filter_rhs, F):
filter_expr = (filter_lhs, OuterRef(filter_rhs.name))
# Generate the inner query.
query = Query(self.model)