Recover installation when creating the user failed

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

diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 920baf3e4ee1021094160fe53e045f6521ed92ed..491419dfaf6b6fa0f4555f1ff6278049080c2418 100644 (file)
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -129,6 +129,7 @@ class MySQL extends AbstractDatabase {
                                'exception' => $ex,
                                'app' => 'mysql.setup',
                        ]);
+                       throw $ex;
                }
        }
 
@@ -138,6 +139,9 @@ class MySQL extends AbstractDatabase {
         * @return array
         */
        private function createSpecificUser($username, $connection) {
+               $rootUser = $this->dbUser;
+               $rootPassword = $this->dbPassword;
+
                try {
                        //user already specified in config
                        $oldUser = $this->config->getValue('dbuser', false);
@@ -180,6 +184,9 @@ class MySQL extends AbstractDatabase {
                                'exception' => $ex,
                                'app' => 'mysql.setup',
                        ]);
+                       // Restore the original credentials
+                       $this->dbUser = $rootUser;
+                       $this->dbPassword = $rootPassword;
                }
 
                $this->config->setValues([