Added Exception catch in case of DB User exists

Signed-off-by: Hemanth Kumar Veeranki <hemanthveeranki@gmail.com>

diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index c022616d8b3d6113618c06ed7866f9ae4eb5136c..d1399c8821c05c05635a1a195281f718b45897d5 100644 (file)
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -87,14 +87,22 @@ class MySQL extends AbstractDatabase {
         * @throws \OC\DatabaseSetupException
         */
        private function createDBUser($connection) {
-               $name = $this->dbUser;
-               $password = $this->dbPassword;
-               // we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
-               // the anonymous user would take precedence when there is one.
-               $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
-               $connection->executeUpdate($query);
-               $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
-               $connection->executeUpdate($query);
+               try{
+                       $name = $this->dbUser;
+                       $password = $this->dbPassword;
+                       // we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
+                       // the anonymous user would take precedence when there is one.
+                       $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
+                       $connection->executeUpdate($query);
+                       $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
+                       $connection->executeUpdate($query);
+               }
+               catch (\Exception $ex){
+                       $this->logger->error('Database User creation failed: {error}', [
+                                'app' => 'mysql.setup',
+                                'error' => $ex->getMessage()
+                        ]);
+               }
        }
 
        /**