mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-12 02:12:38 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #33073 -- Fixed queryset crash with aggregation and empty/extra queryset annotation.

Browse Source
This commit is contained in:
David Wobrock 2021-08-31 22:37:07 +02:00 committed by Mariusz Felisiak
parent 338fc0e7f1
commit 691486a5cf
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/sql/query.py
View File

@ -1692,7 +1692,7 @@ class Query(BaseExpression):
yield expr yield expr
elif include_external and callable(getattr(expr, 'get_external_cols', None)): elif include_external and callable(getattr(expr, 'get_external_cols', None)):
yield from expr.get_external_cols() yield from expr.get_external_cols()
else: elif hasattr(expr, 'get_source_expressions'):
yield from cls._gen_cols( yield from cls._gen_cols(
expr.get_source_expressions(), expr.get_source_expressions(),
include_external=include_external, include_external=include_external,

14
tests/aggregation/tests.py
View File

@ -1603,3 +1603,17 @@ class AggregateTestCase(TestCase):
value=Sum('price', filter=Q(rating__lt=3.0), default=Avg('pages') / 10.0), value=Sum('price', filter=Q(rating__lt=3.0), default=Avg('pages') / 10.0),
) )
self.assertAlmostEqual(result['value'], Decimal('61.72'), places=2) self.assertAlmostEqual(result['value'], Decimal('61.72'), places=2)
def test_exists_none_with_aggregate(self):
qs = Book.objects.all().annotate(
count=Count('id'),
exists=Exists(Author.objects.none()),
)
self.assertEqual(len(qs), 6)
def test_exists_extra_where_with_aggregate(self):
qs = Book.objects.all().annotate(
count=Count('id'),
exists=Exists(Author.objects.extra(where=['1=0'])),
)
self.assertEqual(len(qs), 6)