From acf4cee95144c55a12492cdd71fa795d7accfe26 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Fri, 17 Nov 2023 19:42:44 -0500 Subject: [4.2.x] Fixed #34975 -- Fixed crash of conditional aggregate() over aggregations. Adjustments made to solve_lookup_type to defer the resolving of references for summarized aggregates failed to account for similar requirements for lookup values which can also reference annotations through Aggregate.filter. Regression in b181cae2e3697b2e53b5b67ac67e59f3b05a6f0d. Refs #25307. Thanks Sergey Nesterenko for the report. Backport of 7530cf3900ab98104edcde69e8a2a415e82b345a from main --- django/db/models/sql/query.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (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 0709c4a45f..f98c6c668b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1199,12 +1199,13 @@ class Query(BaseExpression): sql = "(%s)" % sql return sql, params - def resolve_lookup_value(self, value, can_reuse, allow_joins): + def resolve_lookup_value(self, value, can_reuse, allow_joins, summarize=False): if hasattr(value, "resolve_expression"): value = value.resolve_expression( self, reuse=can_reuse, allow_joins=allow_joins, + summarize=summarize, ) elif isinstance(value, (list, tuple)): # The items of the iterable may be expressions and therefore need @@ -1432,7 +1433,7 @@ class Query(BaseExpression): raise FieldError("Joined field references are not permitted in this query") pre_joins = self.alias_refcount.copy() - value = self.resolve_lookup_value(value, can_reuse, allow_joins) + value = self.resolve_lookup_value(value, can_reuse, allow_joins, summarize) used_joins = { k for k, v in self.alias_refcount.items() if v > pre_joins.get(k, 0) } -- cgit v1.3