From 3175f97d4e98ebf340806c3a890e12b6a7d78ce2 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Fri, 26 Apr 2024 15:52:40 +0800
Subject: [PATCH] opt: kpi report

---
 misc/importdb.sh | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/misc/importdb.sh b/misc/importdb.sh
index 11113f0a..df7da87f 100644
--- a/misc/importdb.sh
+++ b/misc/importdb.sh
@@ -15,16 +15,22 @@ case "$1" in
         upgrade)
 			echo "Upgrade database ${DBNAME}"
 			for SQL in ${UpgradeSQLDir}/*.sql; do 
-				echo "Execute SQL script: ${SQL} ..."
+				echo -n "Execute SQL script: ${SQL} ..."
 				mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+				if [ $? = 0 ]; then
+                	echo "done" 
+        		fi 					
 			done
         ;;
 
         upgvue3)
 			echo "Upgrade to vue3 database ${DBNAME}"
 			for SQL in ${Upgvue3SQLDir}/*.sql; do 
-				echo "Execute SQL script: ${SQL} ..."
-				mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+				echo -n "Execute SQL script: ${SQL} ..."
+				mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
+				if [ $? = 0 ]; then
+                	echo "done" 
+        		fi 					 
 			done
         ;;
 
@@ -34,8 +40,11 @@ case "$1" in
 			echo "Create database ${DBNAME} if not exist"
 			mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}"
 			for SQL in ${InstallSQLDir}/*.sql; do 
-				echo "Execute SQL script: ${SQL} ..."
+				echo -n "Execute SQL script: ${SQL} ..."
 				mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+				if [ $? = 0 ]; then
+                	echo "done" 
+        		fi 				
 			done
         ;;
 		
@@ -50,8 +59,11 @@ case "$1" in
 						echo "Upgrade database ${DBNAME}"
 							
 						for SQL in ${UpgradeSQLDir}/*.sql; do 
-							echo "Execute SQL script: ${SQL} ..."
-							mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+							echo -n "Execute SQL script: ${SQL} ..."
+							mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
+							if [ $? = 0 ]; then
+                				echo "done" 
+        					fi 							 
 						done
 
 			            break
@@ -62,8 +74,11 @@ case "$1" in
 						echo "Upgrade to vue3 database ${DBNAME}"
 
 						for SQL in ${Upgvue3SQLDir}/*.sql; do 
-							echo "Execute SQL script: ${SQL} ..."
-							mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+							echo -n "Execute SQL script: ${SQL} ..."
+							mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
+							if [ $? = 0 ]; then
+                				echo "done" 
+        					fi 							 
 						done
 
 			            break
@@ -77,8 +92,11 @@ case "$1" in
 						mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}"
 
 						for SQL in ${InstallSQLDir}/*.sql; do 
-							echo "Execute SQL script: ${SQL} ..."
-							mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+							echo -n "Execute SQL script: ${SQL} ..."
+							mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
+							if [ $? = 0 ]; then
+                				echo "done" 
+        					fi 
 						done
 
 			            break           
@@ -102,7 +120,7 @@ ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME}
 for ne_type in ${ne_types}; do
         TABLE_NAME="kpi_report_${ne_type}"
         SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0"
-        echo -n "Create ${TABLE_NAME} table ..."
+        echo -n "Create table: ${TABLE_NAME} ..."
         mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}";
         if [ $? = 0 ]; then
                 echo "done"