Merge pull request #25 from MatthiasDeWinter/master

Add option to use custom unix_socket

README.md

@@ -108,7 +108,6 @@ return [
     'mysql' => [
         'dump_command_path' => '',
     ],
-
 ];
 
 

src/BackupHandlers/Database/DatabaseBuilder.php

@@ -17,6 +17,7 @@ public function __construct()
 
     public function getDatabase(array $realConfig)
     {
+
         try {
             $this->buildMySQL($realConfig);
         } catch (Exception $e) {
@@ -30,13 +31,16 @@ protected function buildMySQL(array $config)
     {
         $port = isset($config['port']) ? $config['port'] : 3306;
 
+        $socket = isset($config['unix_socket']) ? $config['unix_socket'] : '';
+
         $this->database = new Databases\MySQLDatabase(
             $this->console,
             $config['database'],
             $config['username'],
             $config['password'],
             $config['host'],
-            $port
+            $port,
+            $socket
         );
     }
 }

src/BackupHandlers/Database/Databases/MySQLDatabase.php

@@ -11,6 +11,7 @@ class MySQLDatabase implements DatabaseInterface
     protected $password;
     protected $host;
     protected $port;
+    protected $socket;
 
     /**
      * @param Console $console
@@ -20,14 +21,15 @@ class MySQLDatabase implements DatabaseInterface
      * @param $host
      * @param $port
      */
-    public function __construct(Console $console, $database, $user, $password, $host, $port)
+    public function __construct(Console $console, $database, $user, $password, $host, $port, $socket)
     {
         $this->console = $console;
         $this->database = $database;
         $this->user = $user;
         $this->password = $password;
         $this->host = $host;
         $this->port = $port;
+        $this->socket = $socket;
     }
 
     /**
@@ -52,11 +54,12 @@ public function dump($destinationFile)
         );
         $temporaryCredentialsFile = stream_get_meta_data($tempFileHandle)['uri'];
 
-        $command = sprintf('%smysqldump --defaults-extra-file=%s --skip-comments --skip-extended-insert %s > %s',
+        $command = sprintf('%smysqldump --defaults-extra-file=%s --skip-comments --skip-extended-insert %s > %s %s',
             $this->getDumpCommandPath(),
             escapeshellarg($temporaryCredentialsFile),
             escapeshellarg($this->database),
-            escapeshellarg($destinationFile)
+            escapeshellarg($destinationFile),
+            escapeshellarg($this->getSocketArgument())
         );
 
         return $this->console->run($command);
@@ -79,6 +82,21 @@ public function getFileExtension()
      */
     protected function getDumpCommandPath()
     {
-        return Config::get('laravel-backup.mysql.dump_command_path');
+        return config('laravel-backup.mysql.dump_command_path');
+    }
+
+    /**
+     * Set the socket if one is specified in the configuration
+     *
+     * @return string
+     */
+    protected function getSocketArgument()
+    {
+        if($this->socket != '')
+        {
+            return '--socket=' . $this->socket;
+        }
+
+        return '';
     }
 }

tests/DatabaseBuilderTest.php

@@ -15,8 +15,10 @@ public function testMySQL()
             'port'     => '3307',
         ];
 
+        $socket = '/var/run/mysqld/mysqld.sock';
+
         $databaseBuilder = new DatabaseBuilder();
-        $database = $databaseBuilder->getDatabase($config);
+        $database = $databaseBuilder->getDatabase($config, $socket);
 
         $this->assertInstanceOf('Spatie\Backup\BackupHandlers\Database\Databases\MySQLDatabase', $database);
     }

tests/database/MySQLDatabaseTest.php

@@ -15,7 +15,7 @@ public function setUp()
         $this->console = m::mock('Spatie\Backup\Console');
 
         $this->database = new MySQLDatabase(
-            $this->console, 'testDatabase', 'testUser', 'password', 'localhost', '3306'
+            $this->console, 'testDatabase', 'testUser', 'password', 'localhost', '3306', '/var/run/mysqld/mysqld.sock'
         );
     }
 
@@ -45,4 +45,19 @@ public function testDump()
             $this->database->dump('testfile.sql')
         );
     }
+
+    public function testCustomSocket()
+    {
+        $this->database = new MySQLDatabase(
+            $this->console, 'testDatabase', 'testUser', 'password', 'localhost', '3306', 'customSocket.sock'
+        );
+        $this->console->shouldReceive('run')
+            ->with("/mysqldump --defaults-extra-file='(.*)' --skip-comments --skip-extended-insert 'testDatabase' > 'testfile.sql' '--socket=customSocket.sock'/")
+            ->once()
+            ->andReturn(true);
+
+        $this->assertTrue(
+            $this->database->dump('testfile.sql')
+        );
+    }
 }