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

1 files changed, 3 insertions, 0 deletions

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 9d4bb69d48..fa7ae51d9c 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -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)