summaryrefslogtreecommitdiff
path: root/django/contrib/postgres
diff options
context:
space:
mode:
authorJacob Walls <jacobtylerwalls@gmail.com>2024-12-29 01:13:48 -0800
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2025-08-04 10:14:01 +0200
commit8914f4703cf03e2a01683c4ba00f5ae7d3fa449d (patch)
tree5331d4fac059c893d16875710dc8539ff91bdc81 /django/contrib/postgres
parent079d31e698fa08dd92e2bc4f3fe9b4817a214419 (diff)
Fixed #35972 -- Fixed lookup crashes after subquery annotations.
Diffstat (limited to 'django/contrib/postgres')
-rw-r--r--django/contrib/postgres/search.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/postgres/search.py b/django/contrib/postgres/search.py
index 24f7a497da..4ab27605cb 100644
--- a/django/contrib/postgres/search.py
+++ b/django/contrib/postgres/search.py
@@ -27,7 +27,7 @@ class SearchVectorExact(Lookup):
def as_sql(self, qn, connection):
lhs, lhs_params = self.process_lhs(qn, connection)
rhs, rhs_params = self.process_rhs(qn, connection)
- params = lhs_params + rhs_params
+ params = (*lhs_params, *rhs_params)
return "%s @@ %s" % (lhs, rhs), params
@@ -148,7 +148,7 @@ class SearchVector(SearchVectorCombinable, Func):
weight_sql, extra_params = compiler.compile(clone.weight)
sql = "setweight({}, {})".format(sql, weight_sql)
- return sql, config_params + params + extra_params
+ return sql, (*config_params, *params, *extra_params)
class CombinedSearchVector(SearchVectorCombinable, CombinedExpression):
@@ -318,13 +318,13 @@ class SearchHeadline(Func):
def as_sql(self, compiler, connection, function=None, template=None):
options_sql = ""
- options_params = []
+ options_params = ()
if self.options:
- options_params.append(
+ options_params = (
", ".join(
connection.ops.compose_sql(f"{option}=%s", [value])
for option, value in self.options.items()
- )
+ ),
)
options_sql = ", %s"
sql, params = super().as_sql(