From 1c6cd06ba1e0fa861400ab1682ae017067abdfb7 Mon Sep 17 00:00:00 2001
From: Giovanni Prete <g.prete@entando.com>
Date: Fri, 24 Mar 2023 17:47:02 +0100
Subject: [PATCH 1/2] Add schema creation

---
 docker-entrypoint.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 08fd012..447716d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -46,12 +46,13 @@ else
   $PGCTL reload
 
   # CREATE USER OR ROLE
-  psql -d "$PGUSER" -c "CREATE USER \"${POSTGRESQL_USER}\" WITH PASSWORD '${POSTGRESQL_PASSWORD}';" 
+  psql -d "$PGUSER" -c "CREATE USER \"${POSTGRESQL_USER}\" WITH PASSWORD '${POSTGRESQL_PASSWORD}';"
 
   # CREATE DATABASE
   echo "Creating database: ${POSTGRESQL_DATABASE}"
 
   psql -v ON_ERROR_STOP=1 -d "$PGUSER" -c "CREATE DATABASE \"${POSTGRESQL_DATABASE}\" OWNER '${POSTGRESQL_USER}';"
+  psql -v ON_ERROR_STOP=1 -d "$PGUSER" -d "$POSTGRESQL_DATABASE" -c "CREATE SCHEMA \"${POSTGRESQL_USER}\" AUTHORIZATION \"${POSTGRESQL_USER}\";"
   if [ -n "$POSTGRESQL_ADMIN_PASSWORD" ]; then
     psql -v ON_ERROR_STOP=1 -d "$PGUSER" -c "ALTER USER \"$PGUSER\" WITH ENCRYPTED PASSWORD '${POSTGRESQL_ADMIN_PASSWORD}';"
   fi

From 6f52eeac283242fd5b23d7b29d4f5e492b82aca3 Mon Sep 17 00:00:00 2001
From: Giovanni Prete <g.prete@entando.com>
Date: Tue, 28 Mar 2023 17:45:33 +0200
Subject: [PATCH 2/2] Add POSTGRESQL_SCHEMA variable to make the schema
 creation optional

---
 docker-entrypoint.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 447716d..263fa6e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -52,7 +52,9 @@ else
   echo "Creating database: ${POSTGRESQL_DATABASE}"
 
   psql -v ON_ERROR_STOP=1 -d "$PGUSER" -c "CREATE DATABASE \"${POSTGRESQL_DATABASE}\" OWNER '${POSTGRESQL_USER}';"
-  psql -v ON_ERROR_STOP=1 -d "$PGUSER" -d "$POSTGRESQL_DATABASE" -c "CREATE SCHEMA \"${POSTGRESQL_USER}\" AUTHORIZATION \"${POSTGRESQL_USER}\";"
+  if [ -n "$POSTGRESQL_SCHEMA" ]; then
+    psql -v ON_ERROR_STOP=1 -d "$PGUSER" -d "$POSTGRESQL_DATABASE" -c "CREATE SCHEMA \"${POSTGRESQL_SCHEMA}\" AUTHORIZATION \"${POSTGRESQL_USER}\";"
+  fi
   if [ -n "$POSTGRESQL_ADMIN_PASSWORD" ]; then
     psql -v ON_ERROR_STOP=1 -d "$PGUSER" -c "ALTER USER \"$PGUSER\" WITH ENCRYPTED PASSWORD '${POSTGRESQL_ADMIN_PASSWORD}';"
   fi