mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-25 21:22:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #33468 -- Fixed QuerySet.aggregate() after annotate() crash on aggregates with default.

Browse source 
Thanks Adam Johnson for the report.
This commit is contained in:
Mariusz Felisiak 2022-01-31 11:33:24 +01:00 • committed by GitHub
parent beb7ddbcee
commit 71e7c8e737
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/aggregation/tests.py
View file

@ -1630,6 +1630,18 @@ class AggregateTestCase(TestCase):
)
self.assertAlmostEqual(result['value'], Decimal('61.72'), places=2)
def test_aggregation_default_after_annotation(self):
result = Publisher.objects.annotate(
double_num_awards=F('num_awards') * 2,
).aggregate(value=Sum('double_num_awards', default=0))
self.assertEqual(result['value'], 40)
def test_aggregation_default_not_in_aggregate(self):
result = Publisher.objects.annotate(
avg_rating=Avg('book__rating', default=2.5),
).aggregate(Sum('num_awards'))
self.assertEqual(result['num_awards__sum'], 20)
def test_exists_none_with_aggregate(self):
qs = Book.objects.all().annotate(
count=Count('id'),