test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved test for distinct Count() to a separate test case.

This commit is contained in:
Étienne Beaulé 2019-07-29 16:36:14 -03:00 committed by Mariusz Felisiak
parent f618e033ac
commit cb3c2da128
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/aggregation/tests.py
View File

@ -388,9 +388,6 @@ class AggregateTestCase(TestCase):
vals = Book.objects.aggregate(Count("rating")) vals = Book.objects.aggregate(Count("rating"))
self.assertEqual(vals, {"rating__count": 6}) self.assertEqual(vals, {"rating__count": 6})
vals = Book.objects.aggregate(Count("rating", distinct=True))
self.assertEqual(vals, {"rating__count": 4})
def test_count_star(self): def test_count_star(self):
with self.assertNumQueries(1) as ctx: with self.assertNumQueries(1) as ctx:
Book.objects.aggregate(n=Count("*")) Book.objects.aggregate(n=Count("*"))
@ -403,6 +400,10 @@ class AggregateTestCase(TestCase):
) )
self.assertEqual(aggs['distinct_ratings'], 4) self.assertEqual(aggs['distinct_ratings'], 4)
def test_distinct_on_aggregate(self):
books = Book.objects.aggregate(ratings=Count('rating', distinct=True))
self.assertEqual(books['ratings'], 4)
def test_non_grouped_annotation_not_in_group_by(self): def test_non_grouped_annotation_not_in_group_by(self):
""" """
An annotation not included in values() before an aggregate should be An annotation not included in values() before an aggregate should be