From bc3319908384bef70849be854fca22e2a5b81b85 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sun, 21 Jan 2024 17:47:23 +1300
Subject: [PATCH] Run patches when creating the database

From now on we should only provide patches, not a patch and modify
the initial SQL and data. Otherwise we never test the patches.
---
 dba/create-database.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dba/create-database.sh b/dba/create-database.sh
index b48e37e6..afa6cc51 100755
--- a/dba/create-database.sh
+++ b/dba/create-database.sh
@@ -132,7 +132,7 @@ psql -qXAt ${PSQLOPTS} ${DBA} -f "${AWLDIR}/dba/schema-management.sql" "${DBNAME
 psql -qXAt ${PSQLOPTS} ${DBA} -f "${DBADIR}/davical.sql" "${DBNAME}" 2>&1
 
 #
-# Set permissions for the application DB user on the database
+# Set permissions for the application DB user on the database.
 if ! ${DBADIR}/update-davical-database ${DBAOPTS} --dbuser "${AWL_DBAUSER}" --dbname "${DBNAME}" --appuser "${AWL_APPUSER}" --nopatch --owner "${AWL_DBAUSER}" ; then
         cat <<EOFAILURE
 * * * * ERROR * * * *
@@ -152,6 +152,13 @@ fi
 # Load the required base data
 psql -qXAt ${PSQLOPTS} ${DBA} -f "${DBADIR}/base-data.sql" "${DBNAME}" | grep -E -v '^10'
 
+
+# Apply any patches.
+if ! ${DBADIR}/update-davical-database ${DBAOPTS} --dbuser "${AWL_DBAUSER}" --dbname "${DBNAME}" --appuser "${AWL_APPUSER}" --owner "${AWL_DBAUSER}" ; then
+    echo "Failed to patch database"
+    exit 1;
+fi
+
 #
 # We can override the admin password generation for regression testing predictability
 if [ "${ADMINPW}" = "" ] ; then