mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[2.2.x] Fixed #30315 -- Fixed crash of ArrayAgg and StringAgg with ordering when used in Subquery.

Browse Source 
Backport of a3f91891d2 from master.
This commit is contained in:
Caio Ariede
2019-05-25 10:19:32 -03:00
committed by Mariusz Felisiak
parent 5bf2c87ece
commit 1172f078eb
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/postgres/aggregates/mixins.py
View File

@@ -33,6 +33,12 @@ class OrderableAggMixin:
return sql, sql_params + ordering_params
return super().as_sql(compiler, connection, ordering='')
def set_source_expressions(self, exprs):
# Extract the ordering expressions because ORDER BY clause is handled
# in a custom way.
self.ordering = exprs[self._get_ordering_expressions_index():]
return super().set_source_expressions(exprs[:self._get_ordering_expressions_index()])
def get_source_expressions(self):
return self.source_expressions + self.ordering