mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-08 18:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #10425 -- Corrected the interaction of .count() with .annotate() when .values() is also involved. Thanks to kmassey for the report.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-03-14 04:32:52 +00:00
parent 83c1572cc4
commit 84ce18fc9b
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
django/db/models/sql/query.py
View file

@ -329,7 +329,7 @@ class BaseQuery(object):
Performs a COUNT() query using the current filter constraints.
"""
obj = self.clone()
if len(self.select) > 1:
if len(self.select) > 1 or self.aggregate_select:
# If a select clause exists, then the query has already started to
# specify the columns that are to be returned.
# In this case, we need to use a subquery to evaluate the count.
@ -1950,6 +1950,7 @@ class BaseQuery(object):
# Clear out the select cache to reflect the new unmasked aggregates.
self.aggregates = {None: count}
self.set_aggregate_mask(None)
self.group_by = None
def add_select_related(self, fields):
"""