From 49bbf6570d9f0880b836f741d79e4cdb6e061ea2 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Thu, 14 May 2020 00:14:48 -0400 Subject: [3.0.x] Fixed #31568 -- Fixed alias reference when aggregating over multiple subqueries. 691def10a0197d83d2d108bd9043b0916d0f09b4 made all Subquery() instances equal to each other which broke aggregation subquery pushdown which relied on object equality to determine which alias it should select. Subquery.__eq__() will be fixed in an another commit but Query.rewrite_cols() should haved used object identity from the start. Refs #30727, #30188. Thanks Makina Corpus for the report. Backport of adfbf653dc1c1d0e0dacc4ed46602d22ba28b004 from master --- django/db/models/sql/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 329a6e16c0..f550d5e28b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -393,7 +393,7 @@ class Query(BaseExpression): else: # Reuse aliases of expressions already selected in subquery. for col_alias, selected_annotation in self.annotation_select.items(): - if selected_annotation == expr: + if selected_annotation is expr: new_expr = Ref(col_alias, expr) break else: -- cgit v1.3