Allow for adding options after the db name (#129)

* Allow for adding options after the db name This is useful for being able to use commands such as SED to edit the stream prior to being written to the dump file ie remove auto-increment values * silly lint fail * Slight naming change as requested
spatie · Apr 16, 2020 · e7a4d3c · e7a4d3c
1 parent e167b8b
commit e7a4d3c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/Databases/MySql.php b/src/Databases/MySql.php
@@ -283,6 +283,10 @@ public function getDumpCommand(string $dumpFile, string $temporaryCredentialsFil
             $command[] = "--tables {$includeTables}";
         }
 
+        foreach ($this->extraOptionsAfterDbName as $extraOptionAfterDbName) {
+            $command[] = $extraOptionAfterDbName;
+        }
+
         return $this->echoToFile(implode(' ', $command), $dumpFile);
     }
 

diff --git a/src/DbDumper.php b/src/DbDumper.php
@@ -43,6 +43,9 @@ abstract class DbDumper
     /** @var array */
     protected $extraOptions = [];
 
+    /** @var array */
+    protected $extraOptionsAfterDbName = [];
+
     /** @var object */
     protected $compressor = null;
 
@@ -238,6 +241,20 @@ public function addExtraOption(string $extraOption)
         return $this;
     }
 
+    /**
+     * @param string $extraOptionAtEnd
+     *
+     * @return $this
+     */
+    public function addExtraOptionAfterDbName(string $extraOptionAfterDbName)
+    {
+        if (! empty($extraOptionAfterDbName)) {
+            $this->extraOptionsAfterDbName[] = $extraOptionAfterDbName;
+        }
+
+        return $this;
+    }
+
     abstract public function dumpToFile(string $dumpFile);
 
     protected function checkIfDumpWasSuccessFul(Process $process, string $outputFile)

diff --git a/tests/MySqlTest.php b/tests/MySqlTest.php
@@ -92,7 +92,7 @@ public function it_can_generate_a_dump_command_without_using_comments()
     }
 
     /** @test */
-    public function it_can_generate_a_dump_command_without_using_extended_insterts()
+    public function it_can_generate_a_dump_command_without_using_extended_inserts()
     {
         $dumpCommand = MySql::create()
             ->setDbName('dbname')
@@ -302,6 +302,20 @@ public function it_can_add_extra_options()
         $this->assertSame('\'mysqldump\' --defaults-extra-file="credentials.txt" --skip-comments --extended-insert --extra-option --another-extra-option="value" dbname > "dump.sql"', $dumpCommand);
     }
 
+    /** @test */
+    public function it_can_add_extra_options_after_db_name()
+    {
+        $dumpCommand = MySql::create()
+            ->setDbName('dbname')
+            ->setUserName('username')
+            ->setPassword('password')
+            ->addExtraOption('--extra-option')
+            ->addExtraOptionAfterDbName('--another-extra-option="value"')
+            ->getDumpCommand('dump.sql', 'credentials.txt');
+
+        $this->assertSame('\'mysqldump\' --defaults-extra-file="credentials.txt" --skip-comments --extended-insert --extra-option dbname --another-extra-option="value" > "dump.sql"', $dumpCommand);
+    }
+
     /** @test */
     public function it_can_get_the_host()
     {