Context Navigation

Ticket #10670: aggregation-copy.2.diff

File aggregation-copy.2.diff, 1.7 KB (added by Alex Gaynor, 16 years ago)

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 0583386..2ce9e29 100644

                class BaseQuery(object):
         obj.distinct = self.distinct
         obj.select_related = self.select_related
         obj.related_select_cols = []
         obj.aggregates = self.aggregates.copy()
+        obj.aggregates = deepcopy(self.aggregates)
         if self.aggregate_select_mask is None:
             obj.aggregate_select_mask = None
         else:
-…
+               def add_to_dict(data, key, value):
         data[key].add(value)
     else:
         data[key] = set([value])

diff --git a/tests/regressiontests/aggregation_regress/models.py b/tests/regressiontests/aggregation_regress/models.py
index 275ea07..2dfa181 100644

                FieldError: Cannot resolve keyword 'foo' into field. Choices are: authors, conta
 >>> Book.objects.annotate(Count('publisher')).values('publisher').count()
+>>> publishers = Publisher.objects.filter(id__in=(1,2))
+>>> publishers
+[<Publisher: Apress>, <Publisher: Sams>]
+>>> publishers = publishers.annotate(n_books=models.Count('book'))
+>>> publishers[0].n_books
+>>> publishers
+[<Publisher: Apress>, <Publisher: Sams>]
+>>> books = Book.objects.filter(publisher__in=publishers)
+>>> books
+[<Book: Practical Django Projects>, <Book: Sams Teach Yourself Django in 24 Hours>, <Book: The Definitive Guide to Django: Web Development Done Right>]
+>>> publishers
+[<Publisher: Apress>, <Publisher: Sams>]
 """
+}
-…
+               if settings.DATABASE_ENGINE != 'sqlite3':
 """