mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 00:56:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #12886 -- aggregation over sliced queryset

Browse Source
This commit is contained in:
Anssi Kääriäinen
2013-08-19 16:00:17 +03:00
parent 7d28bed13b
commit 7737305a4f
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/query.py
View File

@@ -313,14 +313,13 @@ class QuerySet(object):
kwargs[arg.default_alias] = arg
query = self.query.clone()
force_subq = query.low_mark != 0 or query.high_mark is not None
aggregate_names = []
for (alias, aggregate_expr) in kwargs.items():
query.add_aggregate(aggregate_expr, self.model, alias,
is_summary=True)
aggregate_names.append(alias)
return query.get_aggregation(using=self.db)
return query.get_aggregation(using=self.db, force_subq=force_subq)
def count(self):
"""