Compatibility with mariadb 10.x and mysql 8.x

Additional support for extra flags for example is secured mysql/mariadb server
is desired when provisioning tables at initialization.

Issue-ID: POLICY-4183
Issue-ID: POLICY-4340
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Id873b3692237cd867815f2928b56492c9261082e

1 files changed, 15 insertions, 1 deletions

diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/bin/create-guard-table.sh b/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/bin/create-guard-table.sh
index 09a5d409..85350c46 100644
--- a/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/bin/create-guard-table.sh
+++ b/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/bin/create-guard-table.sh
@@ -20,7 +20,11 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
+
+set -x
+
 SQL_FILE="${POLICY_HOME}/mysql/sql/createguardtable.sql"
+SQL_ADDON_FILE="${POLICY_HOME}/mysql/sql/db.sql"
 
 # Remove escape backslashes if present and save output in temp file
 sed 's/\\//g' "${POLICY_HOME}"/apps/guard/xacml.properties > /tmp/temp.xacml.properties
@@ -54,5 +58,15 @@ if [ -z "$DB_PASSWORD" ]; then
     exit 2
 fi
 
+if [ -z "$MYSQL_CMD" ]; then
+    MYSQL_CMD="mysql"
+fi
+
 # Execute sql command using sql file to create table
-mysql -u${DB_USERNAME} -p${DB_PASSWORD} -h${DB_HOSTNAME} < "${SQL_FILE}"
+${MYSQL_CMD} -u${DB_USERNAME} -p${DB_PASSWORD} -h${DB_HOSTNAME} < "${SQL_FILE}"
+
+# Execute additional SQL configuration if provided
+if [ -f "${POLICY_HOME}/mysql/sql/db.sql" ]; then
+    echo "additional SQL to be loaded found"
+    ${MYSQL_CMD} -u${DB_USERNAME} -p${DB_PASSWORD} -h${DB_HOSTNAME} < "${SQL_ADDON_FILE}"
+fi