Ticket #15624: aggregate_bug_quick_patch2.diff

db/models/sql/query.py

@@ -333 +333 @@
             # Return value depends on the type of the field being processed.
             return self.convert_values(value, aggregate.field, connection)
 
+    def disable_select_mask(self):
+        self.old_mask = self.aggregate_select_mask.copy()
+        self._aggregate_select_cache = None
+        self.aggregate_select_mask = None
+
+    def restore_select_mask(self):
+        self.aggregate_select_mask = self.old_mask
+        self._aggregate_select_cache = None
+
     def get_aggregation(self, using):
         """
         Returns the dictionary with the values of the existing aggregations.
@@ -344 +353 @@
         # information but retrieves only the first row. Aggregate
         # over the subquery instead.
         if self.group_by is not None:
+            self.disable_select_mask()
+
             from django.db.models.sql.subqueries import AggregateQuery
             query = AggregateQuery(self.model)
 
@@ -356 +367 @@
                     query.aggregate_select[alias] = aggregate
                     del obj.aggregate_select[alias]
 
+            self.restore_select_mask()
+
             try:
                 query.add_subquery(obj, using)
             except EmptyResultSet: