From 30a01441347d5a2146af2944b29778fa0834d4be Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 17 Jan 2022 18:01:07 +0100 Subject: Fixed #29338 -- Allowed using combined queryset in Subquery. Thanks Eugene Kovalev for the initial patch, Simon Charette for the review, and Chetan Khanna for help. --- django/db/models/sql/query.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index b13c7b6893..e3fdea6f3a 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1048,6 +1048,12 @@ class Query(BaseExpression): clone.bump_prefix(query) clone.subquery = True clone.where.resolve_expression(query, *args, **kwargs) + # Resolve combined queries. + if clone.combinator: + clone.combined_queries = tuple([ + combined_query.resolve_expression(query, *args, **kwargs) + for combined_query in clone.combined_queries + ]) for key, value in clone.annotations.items(): resolved = value.resolve_expression(query, *args, **kwargs) if hasattr(resolved, 'external_aliases'): -- cgit v1.3