mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-03 00:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #15624 -- Made sure aggregations are present in SELECT

Browse source
This commit is contained in:
Florian Hahn 2013-02-19 22:58:09 +01:00 • committed by Anssi Kääriäinen
parent e01b5a5823
commit e888a9b30d
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -321,6 +321,7 @@ class Query(object):
# information but retrieves only the first row. Aggregate
# over the subquery instead.
if self.group_by is not None:
from django.db.models.sql.subqueries import AggregateQuery
query = AggregateQuery(self.model)
@ -996,6 +997,8 @@ class Query(object):
field_name = field_list[0]
source = opts.get_field(field_name)
col = field_name
# We want to have the alias in SELECT clause even if mask is set.
self.append_aggregate_mask([alias])
# Add the aggregate to the query
aggregate.add_to_query(self, alias, col=col, source=source, is_summary=is_summary)