diff options
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/expressions.py | 7 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 181a04493f..9aa78a281f 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -256,6 +256,13 @@ class BaseExpression: for expr in self.get_source_expressions() ) + @cached_property + def contains_subquery(self): + return any( + expr and (getattr(expr, "subquery", False) or expr.contains_subquery) + for expr in self.get_source_expressions() + ) + def resolve_expression( self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False ): diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index a7839ccb4d..4690fd304d 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -452,7 +452,7 @@ class Query(BaseExpression): # members of `aggregates` to resolve against each others. self.append_annotation_mask([alias]) refs_subquery |= any( - getattr(self.annotations[ref], "subquery", False) + getattr(self.annotations[ref], "contains_subquery", False) for ref in aggregate.get_refs() ) refs_window |= any( |