summaryrefslogtreecommitdiff
path: root/django/db/models/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/query.py')
-rw-r--r--django/db/models/query.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 4069c04a14..836d394e9b 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -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):
"""