From bd2fa346122741c7b6a2304d7799a38c04947874 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 12 Dec 2023 15:30:56 +0100
Subject: [PATCH] BUG: fix utils/helpers.sh get_db_args
---
Makefile | 1 +
utils/helpers.sh | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 71fc680..7c1ec3e 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ pipeline-test:
echo 'DATABASE_USER_HOST_LIST="%,"' >> .config
echo "MYSQL_USER_PASSWORD=$(MYSQL_ROOT_PASSWORD)" >> .config
echo "MYSQL_HOST=$(SQL_HOST)" >> .config
+ echo "MYSQL_OPTS=--protocol=TCP" >> .config
sleep 10
make install
./utils/make_db restore_db tests/example.dump.sql
diff --git a/utils/helpers.sh b/utils/helpers.sh
index e313233..86f7d59 100644
--- a/utils/helpers.sh
+++ b/utils/helpers.sh
@@ -57,16 +57,16 @@ function get_db_args {
}
function get_db_args_nodb {
- if [ -n "$DATABASE_USER" ]; then
- mysql_con_arguments="--user=$DATABASE_USER"
+ if [ -n "$MYSQL_USER" ]; then
+ mysql_con_arguments="--user=$MYSQL_USER"
fi
- if [ -n "$DATABASE_USER_PW" ]; then
- mysql_con_arguments="$mysql_con_arguments --password=$DATABASE_USER_PW"
+ if [ -n "$MYSQL_USER_PASSWORD" ]; then
+ mysql_con_arguments="$mysql_con_arguments --password=$MYSQL_USER_PASSWORD"
fi
if [ -n "$MYSQL_HOST" ] && [ "$MYSQL_HOST" != "localhost" ]; then
mysql_con_arguments="$mysql_con_arguments --host=$MYSQL_HOST"
fi
- if [ -n "$MYSQL_PORT" ] && [ "$MYSQL_PORT" != "3306" ]; then
+ if [ -n "$MYSQL_PORT" ] && [ "$MYSQL_PORT" != "3306" ]; then
mysql_con_arguments="$mysql_con_arguments --port=$MYSQL_PORT"
fi
if [ -n "$MYSQL_OPTS" ] ; then
--
GitLab