Ticket #15624: aggregate_bug_quick_patch.diff

db/models/sql/query.py

@@ -337 +337 @@
         # over the subquery instead.
         if self.group_by is not None:
             from django.db.models.sql.subqueries import AggregateQuery
+
+            old_mask = self.aggregate_select_mask
+            self.set_aggregate_mask(None)
+
             query = AggregateQuery(self.model)
 
             obj = self.clone()
@@ -348 +352 @@
                     query.aggregate_select[alias] = aggregate
                     del obj.aggregate_select[alias]
 
+            self.set_aggregate_mask(old_mask)
+            obj.set_aggregate_mask(old_mask)
+
             try:
                 query.add_subquery(obj, using)
             except EmptyResultSet: