--no-create-info --complete-insert

调整顺序

db-utils/db_gen_config.sh

@@ -192,14 +192,14 @@ else
 		do
 			file_name=$db_backup_sub_folders/$table_name.sql
 			echo "mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --tables $table_name --where \"1=1 order by id desc limit 1000\"> $file_name"
-			mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --skip-lock-tables --tables $table_name --where "1=1 order by id desc limit 10000" --skip-add-locks > $file_name
+			mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --skip-lock-tables --tables $table_name --where "1=1 order by id desc limit 10000" --skip-add-locks --no-create-info --complete-insert > $file_name
 		done
 	else
 		for table_name in $sys_table_list
 		do
 			file_name=$db_backup_sub_folders/$table_name.sql
 			echo "mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --tables $table_name > $file_name"
-			mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --skip-lock-tables --tables $table_name --skip-add-locks > $file_name
+			mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --skip-lock-tables --tables $table_name --skip-add-locks --no-create-info --complete-insert > $file_name
 		done
 	fi
 fi

db-utils/db_import.sh

@@ -15,19 +15,6 @@ target_db_port=$5
 
 echo "cd $db_sub_backup_folder"
 cd $db_sub_backup_folder
-echo "delete_business_data:"$delete_business_data
-
-if [ "$delete_business_data" = "true" ];then
-	# echo "DROP DATABASE ${database_name};"
-	# echo "DROP DATABASE ${database_name};" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
-	echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"DROP DATABASE ${database_name};\""
-	mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "DROP DATABASE ${database_name};"
-fi
-# echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
-# echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
-echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;\""
-mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
-if [ $? != 0 ];then echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE ${database_name}\" error";exit -1; fi
 
 for entry in ./*.sql
 do
@@ -35,5 +22,6 @@ do
 	mysql -h $mysql_host -P $target_db_port -uqa -pqatest $database_name < $entry
 	if [ $? != 0 ];then
 		echo "--- mysql -h $mysql_host -P $target_db_port -uqa -pqatest $database_name < $entry import error ---"
+		exit -1
 	fi
 done

db-utils/db_schema_sync.sh

@@ -64,7 +64,17 @@ function db_schema_sync()
 	uuid=$(uuidgen)
 	config_file_name="$sync_config_folder/${database}_${uuid}_db_schema_sync_config.json"
 	db_backup_sub_folders=$db_backup_folder/${uuid}
-	
+
+	if [ "$delete_business_data" = "true" ];then
+		# echo "DROP DATABASE ${database_name};" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
+		echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"DROP DATABASE ${database};\""
+		mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "DROP DATABASE ${database};"
+	fi
+	# echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
+	echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE IF NOT EXISTS \`${database}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;\""
+	mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "CREATE DATABASE IF NOT EXISTS \`${database}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
+	if [ $? != 0 ];then echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE IF NOT EXISTS ${database}\" error";exit -1; fi
+
 	echo "mkdir $db_backup_sub_folders"
 	mkdir -p $db_backup_sub_folders
 	mkdir -p $sync_config_folder
@@ -89,15 +99,16 @@ function db_schema_sync()
 		echo "--- Skip step 2: replace domain name in tables: $database $db_backup_sub_folders ---"
 	fi
 
-	echo "--- Step 3: import basic data from backup file: $database $db_backup_sub_folders ---"
-	sh $work_dir/db_import.sh $database $target_db_host $db_backup_sub_folders $delete_business_data $target_db_port
-	if [ $? != 0 ];then echo "db_import.sh $database error";exit -1; fi
-	
-	echo "--- Step 4: sync schema: $database $target_db_host ---"
+	echo "--- Step 3: sync schema: $database $target_db_host ---"
 	#sync_cmd="mss -conf ${config_file_name} -sync"
 	echo "mss -conf ${config_file_name} -sync > /dev/null"
 	mss -conf ${config_file_name} -sync > /dev/null
 	echo "mysql-schema-sync result:$?"
+
+	echo "--- Step 4: import basic data from backup file: $database $db_backup_sub_folders ---"
+	sh $work_dir/db_import.sh $database $target_db_host $db_backup_sub_folders $delete_business_data $target_db_port
+	# if [ $? != 0 ];then echo "db_import.sh $database error";exit -1; fi
+	
 }
 
 function run_sql_file()