mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-27 13:55:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #33282 -- Fixed a crash when OR'ing subquery and aggregation lookups.

Browse source 
As a QuerySet resolves to Query the outer column references grouping logic
should be defined on the latter and proxied from Subquery for the cases where
get_group_by_cols is called on unresolved expressions.

Thanks Antonio Terceiro for the report and initial patch.
This commit is contained in:
Simon Charette 2021-12-01 00:43:39 -05:00 • committed by Mariusz Felisiak
parent e3bde71676
commit e5a92d400a
3 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
django/db/models/sql/query.py
View file

@ -1053,6 +1053,14 @@ class Query(BaseExpression):
if col.alias in self.external_aliases
]
def get_group_by_cols(self, alias=None):
if alias:
return [Ref(alias, self)]
external_cols = self.get_external_cols()
if any(col.possibly_multivalued for col in external_cols):
return [self]
return external_cols
def as_sql(self, compiler, connection):
# Some backends (e.g. Oracle) raise an error when a subquery contains
# unnecessary ORDER BY clause.