Merge pull request #66 from dlubitz/feature/configurable-db-command

Add configuration to set the local database command

Author: mficzel

Classes/Command/AbstractCommandController.php

@@ -44,6 +44,12 @@ abstract class AbstractCommandController extends CommandController
      */
     protected $flowCommand;
 
+    /**
+     * @var string
+     * @Flow\InjectConfiguration("databaseCommand")
+     */
+    protected $databaseCommand;
+
     /**
      * @Flow\Inject
      * @var ConfigurationService

Classes/Command/CloneCommandController.php

@@ -260,7 +260,8 @@ protected function cloneRemoteHost(
                         (int)$this->databaseConfiguration['port'],
                         $this->databaseConfiguration['user'],
                         $this->databaseConfiguration['password'],
-                        $this->databaseConfiguration['dbname']
+                        $this->databaseConfiguration['dbname'],
+                        $this->databaseCommand
                     )
                 ]
             );
@@ -298,7 +299,8 @@ protected function cloneRemoteHost(
                     (int)$this->databaseConfiguration['port'],
                     $this->databaseConfiguration['user'],
                     $this->databaseConfiguration['password'],
-                    $this->databaseConfiguration['dbname']
+                    $this->databaseConfiguration['dbname'],
+                    $this->databaseCommand
                 )
             ]
         );
@@ -327,7 +329,8 @@ protected function cloneRemoteHost(
                         (int)$this->databaseConfiguration['port'],
                         $this->databaseConfiguration['user'],
                         $this->databaseConfiguration['password'],
-                        $this->databaseConfiguration['dbname']
+                        $this->databaseConfiguration['dbname'],
+                        $this->databaseCommand
                     )
                 ]
             );

Classes/Command/StashCommandController.php

@@ -340,7 +340,8 @@ protected function restoreStashEntry($source, $name, $force = false, $preserve =
                         (int)$this->databaseConfiguration['port'],
                         $this->databaseConfiguration['user'],
                         $this->databaseConfiguration['password'],
-                        $this->databaseConfiguration['dbname']
+                        $this->databaseConfiguration['dbname'],
+                        $this->databaseCommand
                     )
                 ]
             );
@@ -362,7 +363,8 @@ protected function restoreStashEntry($source, $name, $force = false, $preserve =
                 (int)$this->databaseConfiguration['port'],
                 $this->databaseConfiguration['user'],
                 $this->databaseConfiguration['password'],
-                $this->databaseConfiguration['dbname']
+                $this->databaseConfiguration['dbname'],
+                $this->databaseCommand
             ) . ' < ' . $source . '/database.sql'
         );
 

Classes/DBAL/SimpleDBAL.php

@@ -20,12 +20,12 @@ class SimpleDBAL
      * @param string $database
      * @return string
      */
-    public function buildCmd(string $driver, ?string $host, int $port, string $username, string $password, string $database): string
+    public function buildCmd(string $driver, ?string $host, int $port, string $username, string $password, string $database, ?string $databaseCommand = null): string
     {
         if ($driver === 'pdo_mysql') {
-            return sprintf('mysql --host=%s --port=%s --user=%s --password=%s %s', escapeshellarg($host), escapeshellarg($port), escapeshellarg($username), escapeshellarg($password), escapeshellarg($database));
+            return sprintf(($databaseCommand ?: 'mysql') . ' --host=%s --port=%s --user=%s --password=%s %s', escapeshellarg($host), escapeshellarg($port), escapeshellarg($username), escapeshellarg($password), escapeshellarg($database));
         } else if ($driver === 'pdo_pgsql') {
-            return sprintf('PGOPTIONS=--client-min-messages=warning PGPASSWORD=%s psql --quiet --host=%s --port=%s --username=%s --dbname=%s', escapeshellarg($password), escapeshellarg($host), escapeshellarg($port), escapeshellarg($username), escapeshellarg($database));
+            return sprintf('PGOPTIONS=--client-min-messages=warning PGPASSWORD=%s ' . ($databaseCommand ?: 'psql') . ' --quiet --host=%s --port=%s --username=%s --dbname=%s', escapeshellarg($password), escapeshellarg($host), escapeshellarg($port), escapeshellarg($username), escapeshellarg($database));
         }
     }
 

Configuration/Settings.yaml

@@ -3,6 +3,9 @@ Sitegeist:
 
     # the local flow command
     flowCommand: './flow'
+    # the custom local database command, defaults to mysql or psql
+#    databaseCommand: ~
+
 #   # preset which is used by the clone:default command
 #   defaultPreset: 'master'
 #    clonePresets: []