Add Support to pass MySQL Options to mysql binary (#98)

Author: stefanzweifel

src/Databases/MySql.php

@@ -31,9 +31,9 @@ public function getImportCommand(string $dumpFile, string $connection): string
         ];
 
         if (str($dumpFile)->endsWith('sql')) {
-            $command = $this->getMySqlImportCommandForUncompressedDump($importToDatabase, $dumpFile, $credentialsArray);
+            $command = $this->getMySqlImportCommandForUncompressedDump($importToDatabase, $dumpFile, $credentialsArray, $connection);
         } else {
-            $command = $this->getMySqlImportCommandForCompressedDump($dumpFile, $importToDatabase, $credentialsArray);
+            $command = $this->getMySqlImportCommandForCompressedDump($dumpFile, $importToDatabase, $credentialsArray, $connection);
         }
 
         return $command;
@@ -47,7 +47,7 @@ public function getCliName(): string
     /**
      * @throws ImportFailed
      */
-    private function getMySqlImportCommandForCompressedDump(string $storagePathToDatabaseFile, string $importToDatabase, array $credentials): string
+    private function getMySqlImportCommandForCompressedDump(string $storagePathToDatabaseFile, string $importToDatabase, array $credentials, string $connection): string
     {
         $quote = $this->determineQuote();
         $password = $credentials['password'];
@@ -67,10 +67,11 @@ private function getMySqlImportCommandForCompressedDump(string $storagePathToDat
             '-P', $credentials['port'],
             isset($credentials['host']) ? '-h '.$credentials['host'] : '',
             $importToDatabase,
+            $this->getOptions($connection),
         ])->filter()->implode(' ');
     }
 
-    private function getMySqlImportCommandForUncompressedDump(string $importToDatabase, string $storagePathToDatabaseFile, array $credentials): string
+    private function getMySqlImportCommandForUncompressedDump(string $importToDatabase, string $storagePathToDatabaseFile, array $credentials, string $connection): string
     {
         $quote = $this->determineQuote();
         $password = $credentials['password'];
@@ -82,8 +83,14 @@ private function getMySqlImportCommandForUncompressedDump(string $importToDataba
             '-P', $credentials['port'],
             isset($credentials['host']) ? '-h '.$credentials['host'] : '',
             $importToDatabase,
+            $this->getOptions($connection),
             '<',
             $storagePathToDatabaseFile,
         ])->filter()->implode(' ');
     }
+
+    private function getOptions(string $connection): string
+    {
+        return config("database.connections.{$connection}.dump.options", '');
+    }
 }

src/Events/DatabaseDumpImportWasSuccessful.php

@@ -6,5 +6,5 @@
 
 class DatabaseDumpImportWasSuccessful
 {
-    public function __construct(readonly public string $absolutePathToDump) {}
+    public function __construct(public readonly string $absolutePathToDump) {}
 }

src/Events/DatabaseReset.php

@@ -8,5 +8,5 @@
 
 class DatabaseReset
 {
-    public function __construct(readonly public PendingRestore $pendingRestore) {}
+    public function __construct(public readonly PendingRestore $pendingRestore) {}
 }

src/Events/DatabaseRestored.php

@@ -8,5 +8,5 @@
 
 class DatabaseRestored
 {
-    public function __construct(readonly public PendingRestore $pendingRestore) {}
+    public function __construct(public readonly PendingRestore $pendingRestore) {}
 }

src/HealthChecks/Result.php

@@ -9,7 +9,7 @@
 class Result
 {
     public function __construct(
-        readonly public HealthCheck $healthCheck,
+        public readonly HealthCheck $healthCheck,
         public int $status,
         public ?string $message,
     ) {

src/PendingRestore.php

@@ -12,13 +12,13 @@
 class PendingRestore
 {
     public function __construct(
-        readonly public string $disk,
-        readonly public string $backup,
-        readonly public string $connection,
-        readonly public string $restoreId,
-        readonly public string $restoreName,
-        #[SensitiveParameter] readonly public ?string $backupPassword = null,
-        readonly public string $restoreDisk = 'local',
+        public readonly string $disk,
+        public readonly string $backup,
+        public readonly string $connection,
+        public readonly string $restoreId,
+        public readonly string $restoreName,
+        #[SensitiveParameter] public readonly ?string $backupPassword = null,
+        public readonly string $restoreDisk = 'local',
     ) {
         //
     }

tests/TestCase.php

@@ -36,6 +36,9 @@ protected function defineEnvironment($app)
             'database' => env('MYSQL_DATABASE', 'laravel_backup_restore'),
             'username' => env('MYSQL_USERNAME', 'root'),
             'password' => env('MYSQL_PASSWORD', ''),
+            'dump' => [
+                'skip_ssl' => true,
+            ],
         ]);
 
         $app['config']->set('database.connections.mysql-restore', [