Skip to content
Snippets Groups Projects
Verified Commit bd2fa346 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

BUG: fix utils/helpers.sh get_db_args

parent a87e29a4
No related branches found
No related tags found
2 merge requests!27Release v7.0.2,!11DRAFT: file system cleanup
Pipeline #44804 passed
...@@ -86,6 +86,7 @@ pipeline-test: ...@@ -86,6 +86,7 @@ pipeline-test:
echo 'DATABASE_USER_HOST_LIST="%,"' >> .config echo 'DATABASE_USER_HOST_LIST="%,"' >> .config
echo "MYSQL_USER_PASSWORD=$(MYSQL_ROOT_PASSWORD)" >> .config echo "MYSQL_USER_PASSWORD=$(MYSQL_ROOT_PASSWORD)" >> .config
echo "MYSQL_HOST=$(SQL_HOST)" >> .config echo "MYSQL_HOST=$(SQL_HOST)" >> .config
echo "MYSQL_OPTS=--protocol=TCP" >> .config
sleep 10 sleep 10
make install make install
./utils/make_db restore_db tests/example.dump.sql ./utils/make_db restore_db tests/example.dump.sql
......
...@@ -57,16 +57,16 @@ function get_db_args { ...@@ -57,16 +57,16 @@ function get_db_args {
} }
function get_db_args_nodb { function get_db_args_nodb {
if [ -n "$DATABASE_USER" ]; then if [ -n "$MYSQL_USER" ]; then
mysql_con_arguments="--user=$DATABASE_USER" mysql_con_arguments="--user=$MYSQL_USER"
fi fi
if [ -n "$DATABASE_USER_PW" ]; then if [ -n "$MYSQL_USER_PASSWORD" ]; then
mysql_con_arguments="$mysql_con_arguments --password=$DATABASE_USER_PW" mysql_con_arguments="$mysql_con_arguments --password=$MYSQL_USER_PASSWORD"
fi fi
if [ -n "$MYSQL_HOST" ] && [ "$MYSQL_HOST" != "localhost" ]; then if [ -n "$MYSQL_HOST" ] && [ "$MYSQL_HOST" != "localhost" ]; then
mysql_con_arguments="$mysql_con_arguments --host=$MYSQL_HOST" mysql_con_arguments="$mysql_con_arguments --host=$MYSQL_HOST"
fi 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" mysql_con_arguments="$mysql_con_arguments --port=$MYSQL_PORT"
fi fi
if [ -n "$MYSQL_OPTS" ] ; then if [ -n "$MYSQL_OPTS" ] ; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment