add support for insert-ignore

aripringle · ifsnop · commit c8035762238c · 2018-06-30T02:42:12.000+02:00
diff --git a/README.md b/README.md
@@ -128,6 +128,7 @@ $dumpSettingsDefault = array(
     'extended-insert' => true,
     'events' => false,
     'hex-blob' => true, /* faster than escaped content */
+    'insert-ignore' => false,
     'net_buffer_length' => self::MAXLINESIZE,
     'no-autocommit' => true,
     'no-create-info' => false,
@@ -192,6 +193,8 @@ $this->_dumpSettings = self::array_replace_recursive($dumpSettingsDefault, $dump
   - http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html#option_mysqldump_extended-insert
 - **hex-blob**
   - http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html#option_mysqldump_hex-blob
+- **insert-ignore**
+  - https://dev.mysql.com/doc/refman/5.7/en/mysqldump.html#option_mysqldump_insert-ignore
 - **lock-tables**
   - http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html#option_mysqldump_lock-tables
 - **net_buffer_length**
diff --git a/src/Ifsnop/Mysqldump/Mysqldump.php b/src/Ifsnop/Mysqldump/Mysqldump.php
@@ -132,6 +132,7 @@ public function __construct(
             'extended-insert' => true,
             'events' => false,
             'hex-blob' => true, /* faster than escaped content */
+            'insert-ignore' => false,
             'net_buffer_length' => self::MAXLINESIZE,
             'no-autocommit' => true,
             'no-create-info' => false,
@@ -908,19 +909,21 @@ private function listValues($tableName)
         $resultSet = $this->dbHandler->query($stmt);
         $resultSet->setFetchMode(PDO::FETCH_ASSOC);
 
+        $ignore = $this->dumpSettings['insert-ignore'] ? '  IGNORE' : '';
+
         foreach ($resultSet as $row) {
             $vals = $this->prepareColumnValues($tableName, $row);
             if ($onlyOnce || !$this->dumpSettings['extended-insert']) {
 
                 if ($this->dumpSettings['complete-insert']) {
                     $lineSize += $this->compressManager->write(
-                        "INSERT INTO `$tableName` (".
+                        "INSERT$ignore INTO `$tableName` (".
                         implode(", ", $colStmt).
                         ") VALUES (".implode(",", $vals).")"
                     );
                 } else {
                     $lineSize += $this->compressManager->write(
-                        "INSERT INTO `$tableName` VALUES (".implode(",", $vals).")"
+                        "INSERT$ignore INTO `$tableName` VALUES (".implode(",", $vals).")"
                     );
                 }
                 $onlyOnce = false;
diff --git a/tests/create_users.sh b/tests/create_users.sh
@@ -11,6 +11,7 @@ mysql -u root -e "CREATE DATABASE test009;"
 mysql -u root -e "CREATE DATABASE test010;"
 mysql -u root -e "CREATE DATABASE test011;"
 mysql -u root -e "CREATE DATABASE test012;"
+mysql -u root -e "CREATE DATABASE test013;"
 mysql -u root -e "GRANT ALL PRIVILEGES ON test001.* TO 'travis'@'%' WITH GRANT OPTION;"
 mysql -u root -e "GRANT ALL PRIVILEGES ON test002.* TO 'travis'@'%' WITH GRANT OPTION;"
 mysql -u root -e "GRANT ALL PRIVILEGES ON test005.* TO 'travis'@'%' WITH GRANT OPTION;"
@@ -21,6 +22,7 @@ mysql -u root -e "GRANT ALL PRIVILEGES ON test009.* TO 'travis'@'%' WITH GRANT O
 mysql -u root -e "GRANT ALL PRIVILEGES ON test010.* TO 'travis'@'%' WITH GRANT OPTION;"
 mysql -u root -e "GRANT ALL PRIVILEGES ON test011.* TO 'travis'@'%' WITH GRANT OPTION;"
 mysql -u root -e "GRANT ALL PRIVILEGES ON test012.* TO 'travis'@'%' WITH GRANT OPTION;"
+mysql -u root -e "GRANT ALL PRIVILEGES ON test013.* TO 'travis'@'%' WITH GRANT OPTION;"
 mysql -u root -e "GRANT SUPER,LOCK TABLES ON *.* TO 'travis'@'%';"
 mysql -u root -e "GRANT SELECT ON mysql.proc to 'travis'@'%';"
 mysql -u root -e "FLUSH PRIVILEGES;"
diff --git a/tests/delete_users.sh b/tests/delete_users.sh
@@ -7,6 +7,10 @@ mysql -e "DROP DATABASE test006a;"
 mysql -e "DROP DATABASE test006b;"
 mysql -e "DROP DATABASE test008;"
 mysql -e "DROP DATABASE test009;"
+mysql -e "DROP DATABASE test010;"
+mysql -e "DROP DATABASE test011;"
+mysql -e "DROP DATABASE test012;"
+mysql -e "DROP DATABASE test013;"
 
 mysql -e "DROP USER 'travis'";
 
diff --git a/tests/test.php b/tests/test.php
@@ -133,4 +133,12 @@
     ));
 $dump->start("mysqldump-php_test012_no-definer.sql");
 
+print "starting mysql-php_test013.sql" . PHP_EOL;
+$dump = new IMysqldump\Mysqldump(
+    "mysql:unix_socket=/var/run/mysqld/mysqld.sock;dbname=test013",
+    "travis",
+    "",
+    array("insert-ignore" => true));
+$dump->start("mysqldump-php_test013.sql");
+
 exit(0);
diff --git a/tests/test.sh b/tests/test.sh
@@ -33,6 +33,7 @@ mysql -utravis < test009.src.sql; ret[((index++))]=$?
 mysql -utravis < test010.src.sql; ret[((index++))]=$?
 mysql -utravis < test011.src.sql; ret[((index++))]=$?
 mysql -utravis < test012.src.sql; ret[((index++))]=$?
+mysql -utravis < test013.src.sql; ret[((index++))]=$?
 
 checksum_test001 > test001.src.checksum
 checksum_test002 > test002.src.checksum
@@ -69,6 +70,14 @@ mysqldump -utravis test012 \
     > mysqldump_test012.sql
 ret[((index++))]=$?
 
+mysqldump -utravis test013 \
+    --no-autocommit \
+    --extended-insert=false \
+    --hex-blob=true \
+    --insert-ignore \
+    > mysqldump_test013.sql
+ret[((index++))]=$?
+
 php test.php || { echo "ERROR running test.php" && exit -1; }
 ret[((index++))]=$?
 
@@ -93,10 +102,12 @@ cat test005.src.sql | grep ^INSERT > test005.filtered.sql
 cat test008.src.sql | grep FOREIGN > test008.filtered.sql
 cat test010.src.sql | grep CREATE | grep EVENT > test010.filtered.sql
 cat test011.src.sql | egrep "INSERT|GENERATED" > test011.filtered.sql
+cat test013.src.sql | egrep "INSERT" > test013.filtered.sql
 cat mysqldump_test001.sql | grep ^INSERT > mysqldump_test001.filtered.sql
 cat mysqldump_test002.sql | grep ^INSERT > mysqldump_test002.filtered.sql
 cat mysqldump_test005.sql | grep ^INSERT > mysqldump_test005.filtered.sql
 cat mysqldump_test012.sql | grep -E -e '50001 (CREATE|VIEW)' -e '50013 DEFINER' -e 'TRIGGER' | grep -v -e 'TABLE' -e 'CREATE VIEW' > mysqldump_test012.filtered.sql
+cat mysqldump_test013.sql | grep "INSERT" > mysqldump_test013.filtered.sql
 cat mysqldump-php_test001.sql | grep ^INSERT > mysqldump-php_test001.filtered.sql
 cat mysqldump-php_test002.sql | grep ^INSERT > mysqldump-php_test002.filtered.sql
 cat mysqldump-php_test005.sql | grep ^INSERT > mysqldump-php_test005.filtered.sql
@@ -105,6 +116,7 @@ cat mysqldump-php_test010.sql | grep CREATE | grep EVENT > mysqldump-php_test010
 cat mysqldump-php_test011a.sql | egrep "INSERT|GENERATED" > mysqldump-php_test011a.filtered.sql
 cat mysqldump-php_test011b.sql | egrep "INSERT|GENERATED" > mysqldump-php_test011b.filtered.sql
 cat mysqldump-php_test012.sql | grep -E -e '50001 (CREATE|VIEW)' -e '50013 DEFINER' -e 'CREATE.*TRIGGER' > mysqldump-php_test012.filtered.sql
+cat mysqldump-php_test013.sql | grep INSERT > mysqldump-php_test013.filtered.sql
 
 diff test001.filtered.sql mysqldump_test001.filtered.sql
 ret[((index++))]=$?
@@ -151,14 +163,18 @@ ret[((index++))]=$?
 ! grep 'DEFINER' mysqldump-php_test012_no-definer.sql
 ret[((index++))]=$?
 
+# test INSERT IGNORE
+diff mysqldump_test013.filtered.sql mysqldump-php_test013.filtered.sql
+ret[((index++))]=$?
+
 rm *.checksum 2> /dev/null
 rm *.filtered.sql 2> /dev/null
 rm mysqldump* 2> /dev/null
 
 echo "Done $index tests"
 
 retvalue=0
-for i in $(seq 0 35) ; do
+for i in $(seq 0 $index) ; do
     if [[ ${ret[$i]} -ne 0 ]]; then
         echo "test $i returned ${ret[$i]}"
         retvalue=${ret[$i]}
diff --git a/tests/test013.src.sql b/tests/test013.src.sql
@@ -0,0 +1,12 @@
+DROP DATABASE IF EXISTS `test013`;
+CREATE DATABASE `test013`;
+USE `test013`;
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test
+(
+    col INT
+);
+
+INSERT INTO `test` (`col`) VALUES (1);
+
