From ad36a198a12df4dff65992191b3eb0a474e2daac Mon Sep 17 00:00:00 2001 From: David Wobrock Date: Fri, 24 Sep 2021 22:05:02 +0200 Subject: Fixed #33141 -- Renamed Expression.empty_aggregate_value to empty_result_set_value. --- django/db/models/sql/query.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index e9fa0d7547..f772f7048b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -487,11 +487,11 @@ class Query(BaseExpression): self.default_cols = False self.extra = {} - empty_aggregate_result = [ - expression.empty_aggregate_value + empty_set_result = [ + expression.empty_result_set_value for expression in outer_query.annotation_select.values() ] - elide_empty = not any(result is NotImplemented for result in empty_aggregate_result) + elide_empty = not any(result is NotImplemented for result in empty_set_result) outer_query.clear_ordering(force=True) outer_query.clear_limits() outer_query.select_for_update = False @@ -499,7 +499,7 @@ class Query(BaseExpression): compiler = outer_query.get_compiler(using, elide_empty=elide_empty) result = compiler.execute_sql(SINGLE) if result is None: - result = empty_aggregate_result + result = empty_set_result converters = compiler.get_converters(outer_query.annotation_select.values()) result = next(compiler.apply_converters((result,), converters)) -- cgit v1.3