mirror of
https://github.com/django/django.git
synced 2024-11-24 11:48:10 +01:00
Fixed #35778 -- Used JSON_OBJECT database function on PostgreSQL 16+ with server-side bindings.
This commit is contained in:
parent
18b3a9dd39
commit
78c9a27031
@ -162,7 +162,8 @@ class JSONObject(Func):
|
||||
|
||||
def join(self, args):
|
||||
pairs = zip(args[::2], args[1::2], strict=True)
|
||||
return ", ".join([" VALUE ".join(pair) for pair in pairs])
|
||||
# Wrap 'key' in parentheses in case of postgres cast :: syntax.
|
||||
return ", ".join([f"({key}) VALUE {value}" for key, value in pairs])
|
||||
|
||||
def as_native(self, compiler, connection, *, returning, **extra_context):
|
||||
return self.as_sql(
|
||||
@ -174,10 +175,9 @@ class JSONObject(Func):
|
||||
)
|
||||
|
||||
def as_postgresql(self, compiler, connection, **extra_context):
|
||||
if (
|
||||
not connection.features.is_postgresql_16
|
||||
or connection.features.uses_server_side_binding
|
||||
):
|
||||
# Casting keys to text is only required when using JSONB_BUILD_OBJECT
|
||||
# or when using JSON_OBJECT on PostgreSQL 16+ with server-side bindings.
|
||||
# This is done in all cases for consistency.
|
||||
copy = self.copy()
|
||||
copy.set_source_expressions(
|
||||
[
|
||||
@ -185,13 +185,18 @@ class JSONObject(Func):
|
||||
for index, expression in enumerate(copy.get_source_expressions())
|
||||
]
|
||||
)
|
||||
|
||||
if connection.features.is_postgresql_16:
|
||||
return copy.as_native(
|
||||
compiler, connection, returning="JSONB", **extra_context
|
||||
)
|
||||
|
||||
return super(JSONObject, copy).as_sql(
|
||||
compiler,
|
||||
connection,
|
||||
function="JSONB_BUILD_OBJECT",
|
||||
**extra_context,
|
||||
)
|
||||
return self.as_native(compiler, connection, returning="JSONB", **extra_context)
|
||||
|
||||
def as_oracle(self, compiler, connection, **extra_context):
|
||||
return self.as_native(compiler, connection, returning="CLOB", **extra_context)
|
||||
|
Loading…
Reference in New Issue
Block a user