Skip to content

Commit 2751cda

Browse files
committed
HHH-17264 Use json_object to create empty json
1 parent 917457f commit 2751cda

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docker_db.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,12 +635,12 @@ disable_userland_proxy() {
635635
if [[ "$HEALTCHECK_PATH" == "{{.State.Health.Status}}" ]]; then
636636
if [[ ! -f /etc/docker/daemon.json ]]; then
637637
sudo service docker stop
638-
echo '{"userland-proxy": false}' > /etc/docker/daemon.json
638+
sudo bash -c "echo '{\"userland-proxy\": false}' > /etc/docker/daemon.json"
639639
sudo service docker start
640640
elif ! grep -q userland-proxy /etc/docker/daemon.json; then
641-
docker_daemon_json=$(</etc/docker/daemon.json)
641+
export docker_daemon_json=$(</etc/docker/daemon.json)
642642
sudo service docker stop
643-
echo "${docker_daemon_json/\}/,}\"userland-proxy\": false}" > /etc/docker/daemon.json
643+
sudo bash -c 'echo "${docker_daemon_json/\}/,}{\"userland-proxy\": false}" > /etc/docker/daemon.json'
644644
sudo service docker start
645645
fi
646646
fi

hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public void render(
445445
if ( nullable ) {
446446
sqlAppender.append( "coalesce(" );
447447
sqlAppender.append( basePath );
448-
sqlAppender.append( ",cast('{}' as " );
448+
sqlAppender.append( ",json_object(returning " );
449449
sqlAppender.append( ddlTypeName );
450450
sqlAppender.append( "))" );
451451
}

0 commit comments

Comments
 (0)