mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-02 00:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #32478 -- Included nested columns referenced by subqueries in GROUP BY on aggregations.

Browse source 
Regression in fb3f034f1c.

Refs #31094, #31150.

Thanks Igor Pejic for the report.
This commit is contained in:
Simon Charette 2021-02-23 20:56:29 -05:00 • committed by Mariusz Felisiak
parent 3aa545281e
commit 277eea8fcc
3 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
django/db/models/sql/query.py
View file

@ -1072,7 +1072,7 @@ class Query(BaseExpression):
def get_external_cols(self):
exprs = chain(self.annotations.values(), self.where.children)
return [
col for col in self._gen_cols(exprs)
col for col in self._gen_cols(exprs, include_external=True)
if col.alias in self.external_aliases
]
@ -1707,12 +1707,17 @@ class Query(BaseExpression):
return targets, joins[-1], joins
@classmethod
def _gen_cols(cls, exprs):
def _gen_cols(cls, exprs, include_external=False):
for expr in exprs:
if isinstance(expr, Col):
yield expr
elif include_external and callable(getattr(expr, 'get_external_cols', None)):
yield from expr.get_external_cols()
else:
yield from cls._gen_cols(expr.get_source_expressions())
yield from cls._gen_cols(
expr.get_source_expressions(),
include_external=include_external,
)
@classmethod
def _gen_col_aliases(cls, exprs):