diff options
Diffstat (limited to 'tests/postgres_tests')
| -rw-r--r-- | tests/postgres_tests/test_aggregates.py | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/tests/postgres_tests/test_aggregates.py b/tests/postgres_tests/test_aggregates.py index 8963ddbcf1..12f2a38e71 100644 --- a/tests/postgres_tests/test_aggregates.py +++ b/tests/postgres_tests/test_aggregates.py @@ -1,7 +1,7 @@ import json from django.db.models import CharField, F, OuterRef, Q, Subquery, Value -from django.db.models.fields.json import KeyTransform +from django.db.models.fields.json import KeyTextTransform, KeyTransform from django.db.models.functions import Cast, Concat, Substr from django.test.utils import Approximate @@ -106,6 +106,16 @@ class TestGeneralAggregate(PostgreSQLTestCase): ) self.assertEqual(values, {'arrayagg': ['pl', 'en']}) + def test_array_agg_jsonfield_ordering(self): + values = AggregateTestModel.objects.aggregate( + arrayagg=ArrayAgg( + KeyTransform('lang', 'json_field'), + filter=Q(json_field__lang__isnull=False), + ordering=KeyTransform('lang', 'json_field'), + ), + ) + self.assertEqual(values, {'arrayagg': ['en', 'pl']}) + def test_array_agg_filter(self): values = AggregateTestModel.objects.aggregate( arrayagg=ArrayAgg('integer_field', filter=Q(integer_field__gt=0)), @@ -220,6 +230,17 @@ class TestGeneralAggregate(PostgreSQLTestCase): ) self.assertEqual(values, {'stringagg': expected_output}) + def test_string_agg_jsonfield_ordering(self): + values = AggregateTestModel.objects.aggregate( + stringagg=StringAgg( + KeyTextTransform('lang', 'json_field'), + delimiter=';', + ordering=KeyTextTransform('lang', 'json_field'), + output_field=CharField(), + ), + ) + self.assertEqual(values, {'stringagg': 'en;pl'}) + def test_string_agg_filter(self): values = AggregateTestModel.objects.aggregate( stringagg=StringAgg( |