summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-01-04 20:49:11 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-01-04 20:49:43 +0100
commit4f81f6d2364f00262f4577fc1de4e0a6ff424e89 (patch)
treece57aad1838cd1dd2ada543b9d5b4a2ce55a5e5f /django/db/models/sql/query.py
parent02cda09b13e677db01863fa0a7112dba631b9c5c (diff)
[3.0.x] Fixed #31136 -- Disabled grouping by aliases on QuerySet.values()/values_list().
Regression in fb3f034f1c63160c0ff13c609acd01c18be12f80. Thanks Sigurd Ljødal for the report. Backport of 0f843fdd5b9b2f2307148465cd60f4e1b2befbb4 from master
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 7429939cf9..c5a42b2b67 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -2100,7 +2100,9 @@ class Query(BaseExpression):
if self.group_by is True:
self.add_fields((f.attname for f in self.model._meta.concrete_fields), False)
- self.set_group_by()
+ # Disable GROUP BY aliases to avoid orphaning references to the
+ # SELECT clause which is about to be cleared.
+ self.set_group_by(allow_aliases=False)
self.clear_select_fields()
if fields: