diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/sql/query.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 638161afc2..329a6e16c0 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -2141,6 +2141,15 @@ class Query(BaseExpression): # SELECT clause which is about to be cleared. self.set_group_by(allow_aliases=False) self.clear_select_fields() + elif self.group_by: + # Resolve GROUP BY annotation references if they are not part of + # the selected fields anymore. + group_by = [] + for expr in self.group_by: + if isinstance(expr, Ref) and expr.refs not in field_names: + expr = self.annotations[expr.refs] + group_by.append(expr) + self.group_by = tuple(group_by) self.values_select = tuple(field_names) self.add_fields(field_names, True) |