Fixed #34464 -- Fixed queryset aggregation over group by reference.

Regression in 59bea9efd2.

Refs #28477.

Thanks Ian Cubitt for the report.
This commit is contained in:
Simon Charette 2023-04-06 08:19:53 -04:00 committed by Mariusz Felisiak
parent 1c7aed71ec
commit 9daf8b4109
3 changed files with 13 additions and 0 deletions

View file

@ -453,6 +453,9 @@ class Query(BaseExpression):
# filtering against window functions is involved as it
# requires complex realising.
annotation_mask = set()
if isinstance(self.group_by, tuple):
for expr in self.group_by:
annotation_mask |= expr.get_refs()
for aggregate in aggregates.values():
annotation_mask |= aggregate.get_refs()
inner_query.set_annotation_mask(annotation_mask)