Check the new connection on setup like with PostgreSQL and Oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 1ee650fecc67a3ea8e5fa8f85b6df70127396b82..7371c7aeab29edbc285906e6a108a5466ea9a314 100644 (file)
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -58,6 +58,16 @@ class MySQL extends AbstractDatabase {
                //fill the database if needed
                $query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
                $connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
+
+               $connection->close();
+               $connection = $this->connect();
+               try {
+                       $connection->connect();
+               } catch (\Exception $e) {
+                       $this->logger->logException($e);
+                       throw new \OC\DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'),
+                               $this->trans->t('You need to enter details of an existing account.'));
+               }
        }
 
        /**