fix ddlchecker shadows declaration and ci script (pingcap#128)

* fix tests script

* fix tests script

* fix ddlchecker shadow

* fix tests script

Author: LeopPro

ddl_checker/main.go

@@ -125,9 +125,9 @@ func handler(input string) bool {
 		}
 		return true
 	}
-	stmt, err := executableChecker.Parse(input)
-	if err != nil {
-		fmt.Println("[DDLChecker] SQL parse error: ", err.Error())
+	stmt, err1 := executableChecker.Parse(input)
+	if err1 != nil {
+		fmt.Println("[DDLChecker] SQL parse error: ", err1.Error())
 		return true
 	}
 	if !checker.IsDDL(stmt) {
@@ -149,7 +149,7 @@ func handler(input string) bool {
 			}
 		}
 	}
-	err = executableChecker.Execute(tidbContext, input)
+	err := executableChecker.Execute(tidbContext, input)
 	if err == nil {
 		fmt.Println("[DDLChecker] SQL execution succeeded")
 	} else {

tests/checker_integration_test.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
+source ./util.sh
+
 TEST_DATABASE_NAME=import_test
 CHECKER_EXEC="../bin/checker --host ${MYSQL_HOST} --port ${MYSQL_PORT} --user root ${TEST_DATABASE_NAME}"
 MYSQL_EXEC="mysql -h ${MYSQL_HOST} -P ${MYSQL_PORT} -u root"
 
 init(){
+    check_db_status "${MYSQL_HOST}" "${MYSQL_PORT}" mysql
     ${MYSQL_EXEC} -e "drop database if exists ${TEST_DATABASE_NAME};"
     ${MYSQL_EXEC} -e "create database ${TEST_DATABASE_NAME};"
     ${MYSQL_EXEC} -e "create table ${TEST_DATABASE_NAME}.ta(a int primary key, b double, c varchar(10), d date unique, e time unique, f timestamp unique, g date unique, h datetime unique, i year unique);"
@@ -16,12 +19,10 @@ init(){
 
 destroy(){
     ${MYSQL_EXEC} -e "drop database if exists ${TEST_DATABASE_NAME};"
-    checkExit
 }
 
 set -e
 init
 ${CHECKER_EXEC}
-checkExit
 destroy
 

tests/importer_integration_test.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
+source ./util.sh
+
 TEST_DATABASE_NAME=checker_test
-IMPORT_EXEC="../bin/importer -c 1  -P ${MYSQL_PORT} -D ${TEST_DATABASE_NAME}"
+IMPORT_EXEC="../bin/importer -c 1 -h ${MYSQL_HOST} -P ${MYSQL_PORT} -D ${TEST_DATABASE_NAME}"
 MYSQL_EXEC="mysql -h ${MYSQL_HOST} -P ${MYSQL_PORT} -u root"
 
 init(){
+    check_db_status "${MYSQL_HOST}" "${MYSQL_PORT}" mysql
     ${MYSQL_EXEC} -e "drop database if exists ${TEST_DATABASE_NAME};"
     ${MYSQL_EXEC} -e "create database ${TEST_DATABASE_NAME};"
 }

tests/util.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+check_db_status() {
+    while true
+    do
+        if mysqladmin -h "$1" -P "$2" -u root ping > /dev/null 2>&1
+        then
+            break
+        fi
+        sleep 1
+    done
+    echo "$3 is alive"
+}