summaryrefslogtreecommitdiff
path: root/django/contrib/postgres/fields/array.py
diff options
context:
space:
mode:
authorNils VAN ZUIJLEN <nils.van-zuijlen@mailo.com>2023-02-06 22:46:44 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-02-07 13:16:41 +0100
commitae1fe72e9b1f5fe3b05e5b670bd0c205cd305e71 (patch)
tree34aa5fefcb225f95d9574a9eec1863d459af229b /django/contrib/postgres/fields/array.py
parent4403432b759124aa613249373e0d2ede64ae8765 (diff)
downloaddjango-ae1fe72e9b1f5fe3b05e5b670bd0c205cd305e71.tar.gz
Fixed #34285 -- Fixed index/slice lookups on filtered aggregates with ArrayField.
Thanks Simon Charette for the review.
Diffstat (limited to 'django/contrib/postgres/fields/array.py')
-rw-r--r--django/contrib/postgres/fields/array.py8
1 files changed, 6 insertions, 2 deletions
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: