Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17264 Use json_object to create empty json

This commit is contained in:
Christian Beikov 2023-09-27 20:12:46 +02:00
parent 917457f36d
commit 2751cdacb1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker_db.sh
View File

@ -635,12 +635,12 @@ disable_userland_proxy() {
if [[ "$HEALTCHECK_PATH" == "{{.State.Health.Status}}" ]]; then if [[ "$HEALTCHECK_PATH" == "{{.State.Health.Status}}" ]]; then
if [[ ! -f /etc/docker/daemon.json ]]; then if [[ ! -f /etc/docker/daemon.json ]]; then
sudo service docker stop 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 sudo service docker start
elif ! grep -q userland-proxy /etc/docker/daemon.json; then elif ! grep -q userland-proxy /etc/docker/daemon.json; then
docker_daemon_json=$(</etc/docker/daemon.json) export docker_daemon_json=$(</etc/docker/daemon.json)
sudo service docker stop sudo service docker stop
echo "${docker_daemon_json/\}/,}\"userland-proxy\": false}" > /etc/docker/daemon.json sudo bash -c 'echo "${docker_daemon_json/\}/,}{\"userland-proxy\": false}" > /etc/docker/daemon.json'
sudo service docker start sudo service docker start
fi fi
fi fi

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

@ -445,7 +445,7 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
if ( nullable ) { if ( nullable ) {
sqlAppender.append( "coalesce(" ); sqlAppender.append( "coalesce(" );
sqlAppender.append( basePath ); sqlAppender.append( basePath );
sqlAppender.append( ",cast('{}' as " ); sqlAppender.append( ",json_object(returning " );
sqlAppender.append( ddlTypeName ); sqlAppender.append( ddlTypeName );
sqlAppender.append( "))" ); sqlAppender.append( "))" );
} }