From fab3de8e3102ca7b424e4a7a351421f75721e6d3 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 7 May 2024 16:04:25 +0800 Subject: [PATCH 1/5] fix: kpi_report issue --- misc/importdb.sh | 2 +- tools/misc/tables_s.lst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/importdb.sh b/misc/importdb.sh index df7da87f..1a1c2b19 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -119,7 +119,7 @@ esac ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title") 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" + SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY (`id`);" echo -n "Create table: ${TABLE_NAME} ..." mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"; if [ $? = 0 ]; then diff --git a/tools/misc/tables_s.lst b/tools/misc/tables_s.lst index bd9747f1..72d1830f 100644 --- a/tools/misc/tables_s.lst +++ b/tools/misc/tables_s.lst @@ -56,4 +56,5 @@ user_menu user_role cdr_event ue_event +kpi_report #end \ No newline at end of file From 813347287ff8d418abf283269343b6f8e7acff4b Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 7 May 2024 16:05:03 +0800 Subject: [PATCH 2/5] fix... --- misc/importdb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/importdb.sh b/misc/importdb.sh index 1a1c2b19..d10db891 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -119,7 +119,7 @@ esac ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title") 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;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY (`id`);" + SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE kpi_report_test MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);" echo -n "Create table: ${TABLE_NAME} ..." mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"; if [ $? = 0 ]; then From d06b448757baf9e79ed153a23b279f66c08b98c3 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 7 May 2024 16:37:45 +0800 Subject: [PATCH 3/5] fix: kpi_report_xxx(ne_type) issue --- misc/importdb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/importdb.sh b/misc/importdb.sh index d10db891..d2b25fa4 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -119,7 +119,7 @@ esac ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title") 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;ALTER TABLE kpi_report_test MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);" + SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);" echo -n "Create table: ${TABLE_NAME} ..." mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"; if [ $? = 0 ]; then From 2ba4d804c8f4d6975d2bb37aabaddda2ba9f0dc9 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 7 May 2024 16:51:46 +0800 Subject: [PATCH 4/5] fix:... --- misc/importdb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/importdb.sh b/misc/importdb.sh index d2b25fa4..ac7ff2ae 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -121,7 +121,7 @@ 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;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);" echo -n "Create table: ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"; + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e '${SQL}'; if [ $? = 0 ]; then echo "done" fi From 1ccc78d2b12e0055004996ce99b3d7441ff4dccf Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 7 May 2024 17:26:33 +0800 Subject: [PATCH 5/5] fix: kpi report issue --- misc/importdb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/importdb.sh b/misc/importdb.sh index ac7ff2ae..42196aa5 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -119,9 +119,9 @@ esac ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title") 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;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);" + SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN \`id\` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (\`id\`);" echo -n "Create table: ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e '${SQL}'; + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" if [ $? = 0 ]; then echo "done" fi