mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #30665 -- Added support for distinct argument to Avg() and Sum().

Browse Source
This commit is contained in:
Étienne Beaulé
2019-07-30 20:08:55 +02:00
committed by Mariusz Felisiak
parent cb3c2da128
commit 5f24e7158e
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/aggregation/tests.py
View File

@@ -401,8 +401,14 @@ class AggregateTestCase(TestCase):
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)
for aggregate, expected_result in (
(Avg, 4.125),
(Count, 4),
(Sum, 16.5),
):
with self.subTest(aggregate=aggregate.__name__):
books = Book.objects.aggregate(ratings=aggregate('rating', distinct=True))
self.assertEqual(books['ratings'], expected_result)
def test_non_grouped_annotation_not_in_group_by(self):
"""