diff --git a/make_db b/make_db index 295361b880e76176252a15046e4998a1457eecc8..6540e7408217eb57bb24c14a31da9c44a61e1cf5 100755 --- a/make_db +++ b/make_db @@ -23,7 +23,6 @@ # ** end header # To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 -echo "this is make_db" set -e function fail() { @@ -83,7 +82,9 @@ function _install_unit_test_database () { cp .config .test_config echo "DATABASE_NAME=\"$UNITTEST_DATABASE\"" >> .test_config pushd patches + echo "HERE0" ./applyPatches.sh --env=../.test_config + echo "HERE1" popd rm .test_config } @@ -207,21 +208,13 @@ function _db_exists() { && return 0 || return 1 } -echo "HIER1a" - +# TODO cat .config || echo "failed1" -echo "HIER1b" - . .config || echo "failed2" -echo "HIER1c" - source .config || echo "failed3" -echo "HIER2" - - INSTALL_SQL_FILE="db_2_0.sql" if [ -z $LOGIN_PATH ] ; then MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT} @@ -230,11 +223,9 @@ if [ -z $LOGIN_PATH ] ; then else MYSQL_CONNECTION="--login-path=$LOGIN_PATH" fi -echo "HIER3" SQL="$MYSQL_CMD $MYSQL_CONNECTION" -echo "HIER4" case $1 in "drop") drop $2 ;; "grant") grant $2 ;;