浏览代码

Simplified SQLCompiler.get_group_by() a bit.

Simon Charette 2 年之前
父节点
当前提交
0d3ccf7512
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      django/db/models/sql/compiler.py

+ 2 - 4
django/db/models/sql/compiler.py

@@ -128,7 +128,7 @@ class SQLCompiler:
             # 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.
             # 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.
             for expr in self.query.group_by:
                 if not hasattr(expr, "as_sql"):
@@ -148,9 +148,7 @@ class SQLCompiler:
                 continue
             if alias:
                 aliased_exprs[expr] = alias
-            cols = expr.get_group_by_cols()
-            for col in cols:
-                expressions.append(col)
+            expressions.extend(expr.get_group_by_cols())
         if not self._meta_ordering:
             for expr, (sql, params, is_ref) in order_by:
                 # Skip references to the SELECT clause, as all expressions in