From 2751cdacb1ec6d88a2aa8a3f641b35cda6b84fd4 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Wed, 27 Sep 2023 20:12:46 +0200 Subject: [PATCH] HHH-17264 Use json_object to create empty json --- docker_db.sh | 6 +++--- .../hibernate/dialect/aggregate/OracleAggregateSupport.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker_db.sh b/docker_db.sh index da07e06dfd..5c931df858 100755 --- a/docker_db.sh +++ b/docker_db.sh @@ -635,12 +635,12 @@ disable_userland_proxy() { if [[ "$HEALTCHECK_PATH" == "{{.State.Health.Status}}" ]]; then if [[ ! -f /etc/docker/daemon.json ]]; then sudo service docker stop - echo '{"userland-proxy": false}' > /etc/docker/daemon.json + sudo bash -c "echo '{\"userland-proxy\": false}' > /etc/docker/daemon.json" sudo service docker start elif ! grep -q userland-proxy /etc/docker/daemon.json; then - docker_daemon_json=$( /etc/docker/daemon.json + sudo bash -c 'echo "${docker_daemon_json/\}/,}{\"userland-proxy\": false}" > /etc/docker/daemon.json' sudo service docker start fi fi diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java index 827e18c1e5..3971bd5e60 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java @@ -445,7 +445,7 @@ public class OracleAggregateSupport extends AggregateSupportImpl { if ( nullable ) { sqlAppender.append( "coalesce(" ); sqlAppender.append( basePath ); - sqlAppender.append( ",cast('{}' as " ); + sqlAppender.append( ",json_object(returning " ); sqlAppender.append( ddlTypeName ); sqlAppender.append( "))" ); }