Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #20782 -- qs.values().aggregate() failure

In the combination of .values().aggregate() the aggregate_select_mask
didn't include the aggregates added. This resulted in bogus query.

Thanks to Trac alias debanshuk for report.
  • Loading branch information...
commit 4bd55547214ae149acadffe60536c379d51e318f 1 parent 29a09b3
Anssi Kääriäinen akaariai authored
5 django/db/models/query.py
View
@@ -274,9 +274,12 @@ def aggregate(self, *args, **kwargs):
query = self.query.clone()
+ aggregate_names = []
for (alias, aggregate_expr) in kwargs.items():
query.add_aggregate(aggregate_expr, self.model, alias,
- is_summary=True)
+ is_summary=True)
+ aggregate_names.append(alias)
+ query.append_aggregate_mask(aggregate_names)
return query.get_aggregation(using=self.db)
4 django/db/models/sql/query.py
View
@@ -1753,6 +1753,10 @@ def set_aggregate_mask(self, names):
self.aggregate_select_mask = set(names)
self._aggregate_select_cache = None
+ def append_aggregate_mask(self, names):
+ if self.aggregate_select_mask is not None:
+ self.set_aggregate_mask(set(names).union(self.aggregate_select_mask))
+
def set_extra_mask(self, names):
"""
Set the mask of extra select items that will be returned by SELECT,
11 tests/aggregation/tests.py
View
@@ -585,3 +585,14 @@ def test_dates_with_aggregation(self):
"datetime.date(2008, 1, 1)"
]
)
+
+ def test_values_aggregation(self):
+ # Refs #20782
+ max_rating = Book.objects.values('rating').aggregate(max_rating=Max('rating'))
+ self.assertEqual(max_rating['max_rating'], 5)
+ max_books_per_rating = Book.objects.values('rating').annotate(
+ books_per_rating=Count('id')
+ ).aggregate(Max('books_per_rating'))
+ self.assertEqual(
+ max_books_per_rating,
+ {'books_per_rating__max': 3})
Please sign in to comment.
Something went wrong with that request. Please try again.