From c8df2f994130d74ec35d32a36e30aad7d6ea8e3a Mon Sep 17 00:00:00 2001 From: Chris Muthig Date: Wed, 3 Apr 2024 16:09:44 -0600 Subject: Fixed #35339 -- Fixed PostgreSQL aggregate's filter and order_by params order. Updated OrderableAggMixin.as_sql() to separate the order_by parameters from the filter parameters. Previously, the parameters and SQL were calculated by the Aggregate parent class, resulting in a mixture of order_by and filter parameters. Thanks Simon Charette for the review. --- tests/postgres_tests/test_aggregates.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests/postgres_tests') diff --git a/tests/postgres_tests/test_aggregates.py b/tests/postgres_tests/test_aggregates.py index 386c55da25..7e1e16d0c0 100644 --- a/tests/postgres_tests/test_aggregates.py +++ b/tests/postgres_tests/test_aggregates.py @@ -12,7 +12,7 @@ from django.db.models import ( Window, ) from django.db.models.fields.json import KeyTextTransform, KeyTransform -from django.db.models.functions import Cast, Concat, Substr +from django.db.models.functions import Cast, Concat, LPad, Substr from django.test import skipUnlessDBFeature from django.test.utils import Approximate from django.utils import timezone @@ -238,6 +238,16 @@ class TestGeneralAggregate(PostgreSQLTestCase): ) self.assertEqual(values, {"arrayagg": ["en", "pl"]}) + def test_array_agg_filter_and_ordering_params(self): + values = AggregateTestModel.objects.aggregate( + arrayagg=ArrayAgg( + "char_field", + filter=Q(json_field__has_key="lang"), + ordering=LPad(Cast("integer_field", CharField()), 2, Value("0")), + ) + ) + self.assertEqual(values, {"arrayagg": ["Foo2", "Foo4"]}) + def test_array_agg_filter(self): values = AggregateTestModel.objects.aggregate( arrayagg=ArrayAgg("integer_field", filter=Q(integer_field__gt=0)), -- cgit v1.3