[PATCH] View name contains space, backup fails (#3)

* Improved unit tests
* Migrated to latest shunit2 & now using github as source
* Added test cases & improved tests
* Bug fix for `View name contains space`
* Added exit codes & added tests

Author: williamdes

.travis.yml

@@ -34,9 +34,8 @@ before_script: |
 before_install:
   - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('testbench'), host='%', password_last_changed=FROM_UNIXTIME(1523829600) where User='root'; update user set plugin='mysql_native_password'; delete from user where User != 'root' OR host != '%'; delete from user where User = 'sys'; FLUSH PRIVILEGES;"
   - sudo service mysql restart
-  - "[ -f shunit2-2.0.3.tgz ] || wget http://downloads.sourceforge.net/shunit2/shunit2-2.0.3.tgz -O shunit2-2.0.3.tgz"
-  - tar zxf shunit2-2.0.3.tgz && rm shunit2-2.0.3.tgz
-  - chmod +x ./shunit2-2.0.3/src/shell/shunit2
+  - wget https://github.com/kward/shunit2/archive/v2.1.7.tar.gz -O shunit2-2.1.7.tar.gz && tar zxf shunit2-2.1.7.tar.gz && rm shunit2-2.1.7.tar.gz
+  - chmod +x ./shunit2-2.1.7/shunit2
 
 script:
     - kcov --include-pattern=backup.sh,tests.sh --exclude-pattern=coverage coverage ./tests.sh

backup.sh

@@ -95,7 +95,7 @@ if [ ! -z "${SKIP_DATABASES}" ]; then
     # Split on ,
     SKIP_DATABASES=$(echo -e "${SKIP_DATABASES}" | tr "," "\n")
     for DB in ${SKIP_DATABASES} ; do
-    VIEW_LIST_SQL="${VIEW_LIST_SQL}'${DB}'," ;
+      VIEW_LIST_SQL="${VIEW_LIST_SQL}'${DB}'," ;
     done
     VIEW_LIST_SQL="${VIEW_LIST_SQL: : -1}"
     VIEW_LIST_SQL="${VIEW_LIST_SQL});"
@@ -107,65 +107,73 @@ fi
 VIEWS_LIST=$(mysql ${MYSQL_CONN} -ANe"${VIEW_LIST_SQL}")
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 204 "Views listing failed"
+  exitWithMsg 205 "Views listing failed"
 fi
 
-VIEW_IGNORE_ARG=""
+VIEW_IGNORE_ARG=()
 # Split on :!
 VIEWS=$(echo -e "${VIEWS_LIST}" | tr ":!" "\n")
+# echo -e "${VIEWS}"
 
+oldIFS=$IFS
+IFS=$'\n'
 for VIEW in $VIEWS; do # Concat ignore command
-    VIEW_IGNORE_ARG="${VIEW_IGNORE_ARG} --ignore-table=${VIEW}"
+  # Replace ` in ${VIEW}, does not work with ` for --ignore-table
+  VIEW="${VIEW//\`/}"
+  #VIEW=$(printf '%q' "${VIEW}")
+  VIEW_IGNORE_ARG+=(--ignore-table=${VIEW} )
 done
-# Replace ` in ${VIEW_IGNORE_ARG}, does not work with ` in table/database names
-VIEW_IGNORE_ARG=${VIEW_IGNORE_ARG//\`/}
-# echo -e "${VIEW_IGNORE_ARG}"
-
+IFS=$oldIFS
+# echo "${VIEW_IGNORE_ARG[@]}";
 echo "Structure..."
-mysqldump ${MYSQLDUMP_DEFAULTS} --routines=FALSE --triggers=FALSE --events=FALSE --no-data ${VIEW_IGNORE_ARG} --databases ${DBS} > ${BACKUP_DIR}/structure.sql
+mysqldump ${MYSQLDUMP_DEFAULTS} --skip-add-drop-table --routines=FALSE --triggers=FALSE --events=FALSE --no-data "${VIEW_IGNORE_ARG[@]}" --databases ${DBS} > ${BACKUP_DIR}/structure.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Structure dump failed"
+  exitWithMsg 207 "Structure dump failed"
 fi
 
 echo "Data ..."
-mysqldump ${MYSQLDUMP_DEFAULTS} --routines=FALSE --triggers=FALSE --events=FALSE --no-create-info ${VIEW_IGNORE_ARG} --databases ${DBS} > ${BACKUP_DIR}/database.sql
+mysqldump ${MYSQLDUMP_DEFAULTS} --routines=FALSE --triggers=FALSE --events=FALSE --no-create-info "${VIEW_IGNORE_ARG[@]}" --databases ${DBS} > ${BACKUP_DIR}/database.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Data dump failed"
+  exitWithMsg 208 "Data dump failed"
 fi
 
 echo "Routines ..."
 mysqldump ${MYSQLDUMP_DEFAULTS} --routines=TRUE --triggers=FALSE --events=FALSE --no-create-info --no-data --no-create-db --databases ${DBS} > ${BACKUP_DIR}/routines.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Routines dump failed"
+  exitWithMsg 209 "Routines dump failed"
 fi
 
 echo "Triggers ..."
 mysqldump ${MYSQLDUMP_DEFAULTS} --routines=FALSE --triggers=TRUE --events=FALSE --no-create-info --no-data --no-create-db --databases ${DBS} > ${BACKUP_DIR}/triggers.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Triggers dump failed"
+  exitWithMsg 210 "Triggers dump failed"
 fi
 
 echo "Events ..."
 mysqldump ${MYSQLDUMP_DEFAULTS} --routines=FALSE --triggers=FALSE --events=TRUE --no-create-info --no-data --no-create-db --databases ${DBS} > ${BACKUP_DIR}/events.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Events dump failed"
+  exitWithMsg 211 "Events dump failed"
 fi
 
 echo "Views ..."
 VIEWS_SHOW_SQL=""
+oldIFS=$IFS
+IFS=$'\n'
 for VIEW in $VIEWS; do # Concat SHOW CREATE VIEW command
     VIEWS_SHOW_SQL="${VIEWS_SHOW_SQL}SHOW CREATE VIEW ${VIEW};"
 done
+IFS=$oldIFS
+
 # echo -e "${VIEWS_SHOW_SQL}"
 echo ${VIEWS_SHOW_SQL} | sed 's/;/\\G/g' | mysql ${MYSQL_CONN} > ${BACKUP_DIR}/views.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Views dump failed"
+  exitWithMsg 212 "Views dump failed"
 fi
 
 #Keeps lines starting with Create
@@ -185,7 +193,7 @@ echo "Users ..."
 mysqldump ${MYSQLDUMP_DEFAULTS} mysql --no-create-info --complete-insert --tables user db > ${BACKUP_DIR}/users.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Users dump failed"
+  exitWithMsg 213 "Users dump failed"
 fi
 
 echo "Grants ..."
@@ -195,7 +203,7 @@ GRANTS_LIST=$(mysql ${MYSQL_CONN} -ANe"${GRANTS_SQL}")
 echo ${GRANTS_LIST} | mysql --default-character-set=utf8 --skip-comments ${MYSQL_CONN} | sed 's/\(GRANT .*\)/\1;/;s/^\(Grants for .*\)/-- \1 --/;/--/{x;p;x;}' > ${BACKUP_DIR}/grants.sql
 
 if [ "$?" -ne 0 ]; then
-  exitWithMsg 205 "Grants dump failed"
+  exitWithMsg 214 "Grants dump failed"
 fi
 
 # Removes double backslashes >  \\

samples/empty/create.sql

@@ -0,0 +1 @@
+CREATE DATABASE testbench CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;

samples/empty/createuser.sql

@@ -0,0 +1 @@
+CREATE USER 'grantfail'@'%' IDENTIFIED BY 'testbench';

samples/empty/deleteuser.sql

@@ -0,0 +1 @@
+DROP USER 'grantfail'@'%';

samples/empty/destroy.sql

@@ -0,0 +1 @@
+DROP DATABASE testbench;

samples/empty/grantToDB.sql

@@ -0,0 +1 @@
+GRANT ALL PRIVILEGES ON mysql.db TO 'grantfail'@'%';

samples/empty/grantToTestBench.sql

@@ -0,0 +1 @@
+GRANT ALL PRIVILEGES ON testbench.* TO 'grantfail'@'%';

samples/empty/grantToUsers.sql

@@ -0,0 +1 @@
+GRANT ALL PRIVILEGES ON mysql.user TO 'grantfail'@'%';

samples/withdata0/create.sql

@@ -0,0 +1,12 @@
+CREATE DATABASE testbench CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+USE testbench;
+
+CREATE TABLE `table hérétique ! @*:` (
+    `ma première colonne` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
+    `qui utilise encore du latin sérieux` varchar(255) CHARACTER SET latin1 COLLATE latin1_general_ci DEFAULT NULL
+  ) ENGINE=InnoDB DEFAULT CHARSET=big5 COMMENT="Une table horrible";
+
+ALTER TABLE `table hérétique ! @*:` ADD PRIMARY KEY (`ma première colonne`);
+ALTER TABLE `table hérétique ! @*:` ADD INDEX(`qui utilise encore du latin sérieux`);
+ALTER TABLE `table hérétique ! @*:` ADD UNIQUE(`ma première colonne`);
+ALTER TABLE `table hérétique ! @*:` ADD KEY `les cons` (`qui utilise encore du latin sérieux`) USING BTREE;