Added '--extended-insert' support to 'Mysqldump'

Author: sebastianfeldmann

doc/config/source/mysqldump.json

@@ -11,6 +11,7 @@
     "structureOnly": "myTableWithoutData1,myTableWithoutData2",
     "quick": "true",
     "compress": "true",
+    "extendedInsert": "true",
     "hexBlob": "true"
   }
 }

doc/config/source/mysqldump.xml

@@ -30,6 +30,9 @@
   <!-- optional, default=false -->
   <option name="compress" value="true" />
 
+  <!-- optional, default=false -->
+  <option name="extendedInsert" value="true" />
+
   <!-- optional, default=false -->
   <option name="hexBlob" value="true" />
 </source>

src/Backup/Source/Mysqldump.php

@@ -106,6 +106,14 @@ class Mysqldump extends Cli implements Source
      */
     private $compress;
 
+    /**
+     * Use mysqldump with extended insert
+     * -e
+     *
+     * @var boolean
+     */
+    private $extendedInsert;
+
     /**
      * Dump blob fields as hex.
      * --hex-blob
@@ -147,6 +155,7 @@ public function setup(array $conf = array())
         $this->hexBlob         = Util\Str::toBoolean(Util\Arr::getValue($conf, 'hexBlob', ''), false);
         $this->quick           = Util\Str::toBoolean(Util\Arr::getValue($conf, 'quick', ''), false);
         $this->compress        = Util\Str::toBoolean(Util\Arr::getValue($conf, 'compress', ''), false);
+        $this->extendedInsert  = Util\Str::toBoolean(Util\Arr::getValue($conf, 'extendedInsert', ''), false);
         $this->noData          = Util\Str::toBoolean(Util\Arr::getValue($conf, 'noData', ''), false);
     }
 
@@ -202,6 +211,7 @@ public function getExecutable(Target $target)
                              ->useQuickMode($this->quick)
                              ->dumpBlobsHexadecimal($this->hexBlob)
                              ->useCompression($this->compress)
+                             ->useExtendedInsert($this->extendedInsert)
                              ->dumpTables($this->tables)
                              ->dumpDatabases($this->databases)
                              ->ignoreTables($this->ignoreTables)

src/Cli/Executable/Mysqldump.php

@@ -96,6 +96,14 @@ class Mysqldump extends Abstraction implements Executable
      */
     private $noData = false;
 
+    /**
+     * Use mysqldump extended insert mode
+     * -e, --extended-insert
+     *
+     * @var boolean
+     */
+    private $extendedInsert = false;
+
     /**
      * Dump blob fields as hex.
      * --hex-blob
@@ -172,6 +180,18 @@ public function useCompression($bool)
         return $this;
     }
 
+    /**
+     * Use '-e' extended insert mode.
+     *
+     * @param  boolean $bool
+     * @return \phpbu\App\Cli\Executable\Mysqldump
+     */
+    public function useExtendedInsert($bool)
+    {
+        $this->extendedInsert = $bool;
+        return $this;
+    }
+
     /**
      * Use '--hex-blob' to encode binary fields.
      *
@@ -275,6 +295,7 @@ protected function createProcess()
         $cmd->addOptionIfNotEmpty('--host', $this->host);
         $cmd->addOptionIfNotEmpty('-q', $this->quick, false);
         $cmd->addOptionIfNotEmpty('-C', $this->compress, false);
+        $cmd->addOptionIfNotEmpty('-e', $this->extendedInsert, false);
         $cmd->addOptionIfNotEmpty('--hex-blob', $this->hexBlob, false);
 
         if (count($this->tablesToDump)) {

tests/phpbu/Backup/Source/MysqldumpTest.php

@@ -68,6 +68,21 @@ public function testHexBlob()
         $this->assertEquals($path . '/mysqldump --hex-blob --all-databases 2> /dev/null', $cmd);
     }
 
+    /**
+     * Tests Mysqldump::getExecutable
+     */
+    public function testExtendedInsert()
+    {
+        $target = $this->getTargetMock();
+        $path   = realpath(__DIR__ . '/../../../_files/bin');
+        $this->mysqldump->setup(array('pathToMysqldump' => $path, 'extendedInsert' => 'true'));
+
+        $executable = $this->mysqldump->getExecutable($target);
+        $cmd        = $executable->getCommandLine();
+
+        $this->assertEquals($path . '/mysqldump -e --all-databases 2> /dev/null', $cmd);
+    }
+
     /**
      * Tests Mysqldump::backup
      */

tests/phpbu/Cli/Executable/MysqldumpTest.php

@@ -39,6 +39,19 @@ public function testHexBlob()
         $this->assertEquals($path . '/mysqldump --hex-blob --all-databases 2> /dev/null', $cmd);
     }
 
+    /**
+     * Tests Mysqldump::useExtendedInsert
+     */
+    public function testUseExtendedInsert()
+    {
+        $path      = realpath(__DIR__ . '/../../../_files/bin');
+        $mysqldump = new Mysqldump($path);
+        $mysqldump->useExtendedInsert(true);
+        $cmd       = $mysqldump->getCommandLine();
+
+        $this->assertEquals($path . '/mysqldump -e --all-databases 2> /dev/null', $cmd);
+    }
+
     /**
      * Tests Mysqldump::getCommandLine
      */