diff options
| author | Aarni Koskela <akx@iki.fi> | 2025-03-05 18:45:10 +0200 |
|---|---|---|
| committer | nessita <124304+nessita@users.noreply.github.com> | 2025-03-31 22:43:13 -0300 |
| commit | c972af69e2021b75b89d8bc47e214ef875bbdc06 (patch) | |
| tree | 7a454faf8b3e4fadd1a92ac37b9d1df19a5e3fcb /django/db/models/fields/json.py | |
| parent | 6888375c53476011754f778deabc6cdbfa327011 (diff) | |
Refs #28909 -- Simplified code using unpacking generalizations.
Diffstat (limited to 'django/db/models/fields/json.py')
| -rw-r--r-- | django/db/models/fields/json.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/django/db/models/fields/json.py b/django/db/models/fields/json.py index 188fcf520c..2fc1abb032 100644 --- a/django/db/models/fields/json.py +++ b/django/db/models/fields/json.py @@ -235,7 +235,7 @@ class HasKeyLookup(PostgresOperatorLookup): compiler, connection ): sql_parts.append(template % (lhs_sql, "%s")) - params.extend(lhs_params + [rhs_json_path]) + params.extend([*lhs_params, rhs_json_path]) return self._combine_sql_parts(sql_parts), tuple(params) def as_mysql(self, compiler, connection): @@ -379,7 +379,7 @@ class KeyTransform(Transform): def as_mysql(self, compiler, connection): lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) json_path = compile_json_path(key_transforms) - return "JSON_EXTRACT(%s, %%s)" % lhs, tuple(params) + (json_path,) + return "JSON_EXTRACT(%s, %%s)" % lhs, (*params, json_path) def as_oracle(self, compiler, connection): lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) @@ -410,12 +410,12 @@ class KeyTransform(Transform): lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) if len(key_transforms) > 1: sql = "(%s %s %%s)" % (lhs, self.postgres_nested_operator) - return sql, tuple(params) + (key_transforms,) + return sql, (*params, key_transforms) try: lookup = int(self.key_name) except ValueError: lookup = self.key_name - return "(%s %s %%s)" % (lhs, self.postgres_operator), tuple(params) + (lookup,) + return "(%s %s %%s)" % (lhs, self.postgres_operator), (*params, lookup) def as_sqlite(self, compiler, connection): lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) @@ -426,7 +426,7 @@ class KeyTransform(Transform): return ( "(CASE WHEN JSON_TYPE(%s, %%s) IN (%s) " "THEN JSON_TYPE(%s, %%s) ELSE JSON_EXTRACT(%s, %%s) END)" - ) % (lhs, datatype_values, lhs, lhs), (tuple(params) + (json_path,)) * 3 + ) % (lhs, datatype_values, lhs, lhs), (*params, json_path) * 3 class KeyTextTransform(KeyTransform): @@ -442,7 +442,7 @@ class KeyTextTransform(KeyTransform): else: lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) json_path = compile_json_path(key_transforms) - return "(%s ->> %%s)" % lhs, tuple(params) + (json_path,) + return "(%s ->> %%s)" % lhs, (*params, json_path) @classmethod def from_lookup(cls, lookup): |