Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

Simplified SQLCompiler.get_group_by() a bit.

Browse Source
This commit is contained in:
Simon Charette 2022-11-23 09:50:26 +01:00 committed by Mariusz Felisiak
parent 0b78ac3fc7
commit 0d3ccf7512
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/sql/compiler.py
View File

@ -128,7 +128,7 @@ class SQLCompiler:
# If the group by is set to a list (by .values() call most likely), # If the group by is set to a list (by .values() call most likely),
# then we need to add everything in it to the GROUP BY clause. # then we need to add everything in it to the GROUP BY clause.
# Backwards compatibility hack for setting query.group_by. Remove # Backwards compatibility hack for setting query.group_by. Remove
# when we have public API way of forcing the GROUP BY clause. # when we have public API way of forcing the GROUP BY clause.
# Converts string references to expressions. # Converts string references to expressions.
for expr in self.query.group_by: for expr in self.query.group_by:
if not hasattr(expr, "as_sql"): if not hasattr(expr, "as_sql"):
@ -148,9 +148,7 @@ class SQLCompiler:
continue continue
if alias: if alias:
aliased_exprs[expr] = alias aliased_exprs[expr] = alias
cols = expr.get_group_by_cols() expressions.extend(expr.get_group_by_cols())
for col in cols:
expressions.append(col)
if not self._meta_ordering: if not self._meta_ordering:
for expr, (sql, params, is_ref) in order_by: for expr, (sql, params, is_ref) in order_by:
# Skip references to the SELECT clause, as all expressions in # Skip references to the SELECT clause, as all expressions in