diff options
| author | David Wobrock <david.wobrock@gmail.com> | 2021-09-24 22:05:02 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-09-29 12:58:01 +0200 |
| commit | ad36a198a12df4dff65992191b3eb0a474e2daac (patch) | |
| tree | a890154a129f003f703c5b75e70f61c156d19b33 /django/db/models/sql | |
| parent | 9466fd78420a851460c92673dad50a5737c75b12 (diff) | |
Fixed #33141 -- Renamed Expression.empty_aggregate_value to empty_result_set_value.
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/query.py | 8 |
1 files changed, 4 insertions, 4 deletions
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)) |