mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-30 08:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[2.2.x] Fixed #30332 -- Fixed crash of ordering by expressions with params in ArrayAgg and StringAgg.

Browse source 
Backport of d0315584b5 from master.
This commit is contained in:
Simone Pellizzari 2019-04-06 13:45:22 +02:00 • committed by Mariusz Felisiak
parent 9da25fb832
commit 268ed9cd8a
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/postgres_tests/test_aggregates.py
View file

@ -1,6 +1,7 @@
import json
from django.db.models.expressions import F, Value
from django.db.models.functions import Concat, Substr
from django.test.testcases import skipUnlessDBFeature
from django.test.utils import Approximate
@ -38,6 +39,12 @@ class TestGeneralAggregate(PostgreSQLTestCase):
((F('boolean_field'), F('char_field').desc()), ['Foo4', 'Foo2', 'Foo3', 'Foo1']),
('char_field', ['Foo1', 'Foo2', 'Foo3', 'Foo4']),
('-char_field', ['Foo4', 'Foo3', 'Foo2', 'Foo1']),
(Concat('char_field', Value('@')), ['Foo1', 'Foo2', 'Foo3', 'Foo4']),
(Concat('char_field', Value('@')).desc(), ['Foo4', 'Foo3', 'Foo2', 'Foo1']),
(
(Substr('char_field', 1, 1), F('integer_field'), Substr('char_field', 4, 1).desc()),
['Foo3', 'Foo1', 'Foo2', 'Foo4'],
),
)
for ordering, expected_output in ordering_test_cases:
with self.subTest(ordering=ordering, expected_output=expected_output):
@ -165,6 +172,8 @@ class TestGeneralAggregate(PostgreSQLTestCase):
(F('char_field').desc(), 'Foo4;Foo3;Foo2;Foo1'),
(F('char_field').asc(), 'Foo1;Foo2;Foo3;Foo4'),
(F('char_field'), 'Foo1;Foo2;Foo3;Foo4'),
(Concat('char_field', Value('@')), 'Foo1;Foo2;Foo3;Foo4'),
(Concat('char_field', Value('@')).desc(), 'Foo4;Foo3;Foo2;Foo1'),
)
for ordering, expected_output in ordering_test_cases:
with self.subTest(ordering=ordering, expected_output=expected_output):