summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorDavid Wobrock <david.wobrock@gmail.com>2021-08-31 22:37:07 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-09-01 20:59:16 +0200
commit691486a5cf7588c95250a873c5b57748e82fc4c2 (patch)
tree43075274e06f95450f3ab361279c61a0d0a40996 /django/db/models/sql/query.py
parent338fc0e7f10f7ca781b059f2ff46e1a1a85c91f8 (diff)
Fixed #33073 -- Fixed queryset crash with aggregation and empty/extra queryset annotation.
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 1258eb61a9..39a735b50e 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1692,7 +1692,7 @@ class Query(BaseExpression):
yield expr
elif include_external and callable(getattr(expr, 'get_external_cols', None)):
yield from expr.get_external_cols()
- else:
+ elif hasattr(expr, 'get_source_expressions'):
yield from cls._gen_cols(
expr.get_source_expressions(),
include_external=include_external,