From e8a39da396b3ed8e469f569e4e865a54ae5dad0b Mon Sep 17 00:00:00 2001 From: Nils VAN ZUIJLEN Date: Mon, 6 Feb 2023 22:46:44 +0100 Subject: [4.2.x] Fixed #34285 -- Fixed index/slice lookups on filtered aggregates with ArrayField. Thanks Simon Charette for the review. Backport of ae1fe72e9b1f5fe3b05e5b670bd0c205cd305e71 from main --- django/contrib/postgres/fields/array.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index 8477dd9fff..c8e8e132e0 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -325,7 +325,9 @@ class IndexTransform(Transform): def as_sql(self, compiler, connection): lhs, params = compiler.compile(self.lhs) - return "%s[%%s]" % lhs, params + [self.index] + if not lhs.endswith("]"): + lhs = "(%s)" % lhs + return "%s[%%s]" % lhs, (*params, self.index) @property def output_field(self): @@ -349,7 +351,9 @@ class SliceTransform(Transform): def as_sql(self, compiler, connection): lhs, params = compiler.compile(self.lhs) - return "%s[%%s:%%s]" % lhs, params + [self.start, self.end] + if not lhs.endswith("]"): + lhs = "(%s)" % lhs + return "%s[%%s:%%s]" % lhs, (*params, self.start, self.end) class SliceTransformFactory: -- cgit v1.3