Fix problems with local mysql connections

- Sync is aborting after deletion of application database
- Remove ping with mysql command SELECT 1
- Read LOCAL.mysql and set it as local database connection

Fixes #112

Author: mblaschke

src/app/CliTools/Console/Command/AbstractCommand.php

@@ -353,9 +353,15 @@ protected function mysqlQuote($value) {
      * @param string $sql
      * @return array|null
      */
-    protected function execSqlCommand($sql)
+    protected function execSqlCommand($sql, $database = null)
     {
-        return $this->createMysqlCommand('-e', $sql)->execute()->getOutput();
+        $command = $this->createMysqlCommand('-e', $sql);
+
+        if ($database !== null) {
+            $command->addArgumentTemplate('-D %s', $database);
+        }
+
+        $command->execute()->getOutput();
     }
 
 

src/app/CliTools/Console/Command/AbstractDockerCommand.php

@@ -87,18 +87,6 @@ protected function mysqlQuote($value) {
         return '\'' . addslashes($value) . '\'';
     }
 
-    /**
-     * Execute sql command (using local mysql command)
-     *
-     * @param string $sql
-     * @return array|null
-     */
-    protected function execSqlCommand($sql)
-    {
-        return $this->createMysqlCommand('-e', $sql)->execute()->getOutput();
-    }
-
-
     /**
      * Execute sql command (using local mysql command)
      *

src/app/CliTools/Console/Command/Mysql/RestoreCommand.php

@@ -75,8 +75,8 @@ public function execute(InputInterface $input, OutputInterface $output)
         $output->writeln('<h2>Restoring dump "' . $dumpFile . '" into database "' . $database . '"</h2>');
 
         $output->writeln('<p>Creating database</p>');
-        $this->execSqlCommand('DROP DATABASE IF EXISTS ' . addslashes($database));
-        $this->execSqlCommand('CREATE DATABASE ' . addslashes($database));
+        $this->execSqlCommand('DROP DATABASE IF EXISTS ' . addslashes($database), 'mysql');
+        $this->execSqlCommand('CREATE DATABASE ' . addslashes($database),'mysql');
 
         $commandMysql = $this->createMysqlCommand($database, '--one-database');
 

src/app/CliTools/Console/Command/Sync/AbstractCommand.php

@@ -149,9 +149,34 @@ protected function initializeConfiguration()
         // Read configuration
         $this->readConfiguration();
 
+        $this->initDatabaseConfiguration();
         $this->initDockerContainer();
     }
 
+    /**
+     * Init database configuration (for local one)
+     */
+    protected function initDatabaseConfiguration()
+    {
+        $hostname = DatabaseConnection::getDbHostname();
+        $username = DatabaseConnection::getDbUsername();
+        $password = DatabaseConnection::getDbPassword();
+
+        if ($this->config->exists('LOCAL.mysql.hostname')) {
+            $hostname = $this->config->get('LOCAL.mysql.hostname');
+        }
+
+        if ($this->config->exists('LOCAL.mysql.username')) {
+            $username = $this->config->get('LOCAL.mysql.username');
+        }
+
+        if ($this->config->exists('LOCAL.mysql.password')) {
+            $password = $this->config->get('LOCAL.mysql.password');
+        }
+
+        DatabaseConnection::setDsn('mysql:host=' . $hostname, $username, $password);
+    }
+
     /**
      * Init docker container setting
      */
@@ -883,6 +908,10 @@ protected function createMysqlRestoreCommand($database, $dumpFile)
             $command->addArgumentTemplate('--password %s', $this->config->get('LOCAL.mysql.password'));
         }
 
+        if ($this->output->isVerbose()) {
+            $command->addArgument('-v');
+        }
+
         return $command;
     }
 
@@ -923,6 +952,10 @@ protected function createMysqlBackupCommand($database, $dumpFile, $filterNameBla
             $command->addArgumentTemplate('--whitelist=%s', $filterNameWhitelist);
         }
 
+        if ($this->output->isVerbose()) {
+            $command->addArgument('-v');
+        }
+
         return $command;
     }
 
@@ -985,6 +1018,14 @@ protected function createRemoteMySqlCommand($database = null)
         return $command;
     }
 
+    protected function localMysqlPing()
+    {
+        $echoCommand = new CommandBuilder('echo', 'SELECT 1');
+        $mysqlCommand = $this->createLocalMySqlCommand();
+        $mysqlCommand->setOutputRedirect('> /dev/null');
+        $echoCommand->addPipeCommand($mysqlCommand);
+        $echoCommand->executeInteractive();
+    }
 
     /**
      * Create new mysql command
@@ -1013,7 +1054,7 @@ protected function createLocalMySqlCommand($database = null)
                 $command->addArgumentTemplate('-h%s', DatabaseConnection::getDbHostname());
             }
 
-            // Add hostname
+            // Add port
             if (DatabaseConnection::getDbPort()) {
                 $command->addArgumentTemplate('-P%s', DatabaseConnection::getDbPort());
             }

src/app/CliTools/Console/Command/Sync/DeployCommand.php

@@ -75,7 +75,7 @@ protected function runMain()
 
         // Check database connection
         if ($runMysql && $this->contextConfig->exists('mysql')) {
-            DatabaseConnection::ping();
+            $this->localMysqlPing();
         }
 
         // Sync files with rsync to local storage

src/app/CliTools/Console/Command/Sync/ServerCommand.php

@@ -101,7 +101,7 @@ protected function runMain()
         if ($runMysql && $this->contextConfig->exists('mysql')) {
             // ping only on mysql connection, not dockerized exec calling
             if (!$this->config->exists('LOCAL.mysql.docker') && !$this->config->exists('LOCAL.mysql.docker-compose')) {
-                DatabaseConnection::ping();
+                $this->localMysqlPing();
             }
         }