diff --git a/make_db b/make_db index 8593cc8efc4ec7eefe83ae7168a27b03981b986b..b6d70332aca2a4e1d0a5d798ac635f58d64702ac 100755 --- a/make_db +++ b/make_db @@ -31,11 +31,11 @@ function fail() { exit 1 } -UNITTEST_DATABASE=${UNITTEST_DATABASE-_caosdb_schema_unit_tests}; +UNITTEST_DATABASE=${UNITTEST_DATABASE-_caosdb_schema_unit_tests} # options: [--fresh] function runtests() { - DATABASE_NAME=$UNITTEST_DATABASE; + DATABASE_NAME=$UNITTEST_DATABASE _setup_mytap _install_unit_test_database $@ @@ -207,8 +207,12 @@ function _db_exists() { && return 0 || return 1 } +echo "HIER1" + . .config +echo "HIER2" + INSTALL_SQL_FILE="db_2_0.sql" if [ -z $LOGIN_PATH ] ; then MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT} @@ -217,9 +221,11 @@ 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 ;;