diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-11-20 07:40:06 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-11-24 18:11:19 +0100 |
| commit | b996424199cca58f64b77faeaa367b7e7efb9776 (patch) | |
| tree | 668fd8818a5b0017d662e903cb5f6ccb288c4042 | |
| parent | bec415b290b68c07adcd9c67631b6573666d76be (diff) | |
Simplified JSONField key transforms by using JSON_OBJECT() on Oracle.
| -rw-r--r-- | django/db/models/fields/json.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/django/db/models/fields/json.py b/django/db/models/fields/json.py index 94596556d2..48512ce59c 100644 --- a/django/db/models/fields/json.py +++ b/django/db/models/fields/json.py @@ -385,11 +385,11 @@ class KeyTransformIn(lookups.In): ): if connection.vendor == 'oracle': value = json.loads(param) + sql = "%s(JSON_OBJECT('value' VALUE %%s FORMAT JSON), '$.value')" if isinstance(value, (list, dict)): - sql = "JSON_QUERY(%s, '$.value')" + sql = sql % 'JSON_QUERY' else: - sql = "JSON_VALUE(%s, '$.value')" - params = (json.dumps({'value': value}),) + sql = sql % 'JSON_VALUE' elif connection.vendor in {'sqlite', 'mysql'}: sql = "JSON_EXTRACT(%s, '$')" if connection.vendor == 'mysql' and connection.mysql_is_mariadb: @@ -413,15 +413,14 @@ class KeyTransformExact(JSONExact): rhs, rhs_params = super().process_rhs(compiler, connection) if connection.vendor == 'oracle': func = [] + sql = "%s(JSON_OBJECT('value' VALUE %%s FORMAT JSON), '$.value')" for value in rhs_params: value = json.loads(value) - function = 'JSON_QUERY' if isinstance(value, (list, dict)) else 'JSON_VALUE' - func.append("%s('%s', '$.value')" % ( - function, - json.dumps({'value': value}), - )) + if isinstance(value, (list, dict)): + func.append(sql % 'JSON_QUERY') + else: + func.append(sql % 'JSON_VALUE') rhs = rhs % tuple(func) - rhs_params = [] elif connection.vendor == 'sqlite': func = ["JSON_EXTRACT(%s, '$')" if value != 'null' else '%s' for value in rhs_params] rhs = rhs % tuple(func) |