Commit 84ce18fc authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #10425 -- Corrected the interaction of .count() with .annotate() when... 

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 83c1572c

django/db/models/sql/query.py

+2 −1
Original line number Diff line number Diff line
@@ -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):

        """

tests/regressiontests/aggregation_regress/models.py

+7 −0
Original line number Diff line number Diff line
@@ -252,6 +252,13 @@ FieldError: Cannot resolve keyword 'foo' into field. Choices are: authors, conta 
>>> [int(x['sheets']) for x in qs]

[150, 175, 224, 264, 473, 566]



# Regression for 10425 - annotations don't get in the way of a count() clause

>>> Book.objects.values('publisher').annotate(Count('publisher')).count()

4



>>> Book.objects.annotate(Count('publisher')).values('publisher').count()

6



"""

}