diff --git a/misc/importdb.sh b/misc/importdb.sh index cf193e39..67422110 100755 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -6,7 +6,6 @@ HOST="127.0.0.1" PORT="33066" DBNAME="psap_db" UpgradeSQLDir=/usr/local/omc/etc/db/upgrade -Upgvue3SQLDir=/usr/local/omc/etc/db/upgvue3 InstallSQLDir=/usr/local/omc/etc/db/install drop_db_sql="drop database IF EXISTS ${DBNAME}" @@ -24,17 +23,6 @@ case "$1" in done ;; - upgvue3) - echo "Upgrade to vue3 database ${DBNAME}" - for SQL in ${Upgvue3SQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done - ;; - install) echo "Drop database ${DBNAME} ...!!!" mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" @@ -52,7 +40,7 @@ case "$1" in *) while true do - read -r -p "Do you upgrade or upgrade from layui to vue3 or fresh install database ${DBNAME}? [Upgrade/upgVue3/Install/Quit] " input + read -r -p "Do you upgrade or fresh install database ${DBNAME}? [Upgrade/Install/Quit] " input case $input in [uU][pP][gG][rR][aA][dD][eE]|[uU]) @@ -70,21 +58,6 @@ case "$1" in break ;; - [uU][pP][gG][vV][uU][eE][3]|[vV]]) - echo "Skip to drop database ${DBNAME}" - echo "Upgrade to vue3 database ${DBNAME}" - - for SQL in ${Upgvue3SQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done - - break - ;; - [iI][nN][sS][tT][aA][lL][lL]|[iI]) echo "Drop database ${DBNAME} ...!!!" diff --git a/misc/setomc.sh b/misc/setomc.sh index 437e781e..01b8ded1 100755 --- a/misc/setomc.sh +++ b/misc/setomc.sh @@ -79,7 +79,7 @@ case "${M_ARG}" in fi fi ;; - upgrade | upgvue3) + upgrade) ${OMCBinDir}/importdb.sh ${M_ARG} ;; skip)