Merge remote-tracking branch 'origin/MAGETWO-45069-DB-Name-Durint-Setup' into MAGETWO-45105-Backend-Is-Not-Accessible-If-Port-Is-Used-In-URL

Author: arkadiych

setup/src/Magento/Setup/Test/Unit/Validator/DbValidatorTest.php

@@ -47,28 +47,35 @@ public function testCheckDatabaseConnection()
             ->expects($this->atLeastOnce())
             ->method('query')
             ->willReturn($pdo);
-        $pdo->expects($this->once())
+
+        $listOfPrivileges = [
+            ['SELECT'],
+            ['INSERT'],
+            ['UPDATE'],
+            ['DELETE'],
+            ['CREATE'],
+            ['DROP'],
+            ['REFERENCES'],
+            ['INDEX'],
+            ['ALTER'],
+            ['CREATE TEMPORARY TABLES'],
+            ['LOCK TABLES'],
+            ['EXECUTE'],
+            ['CREATE VIEW'],
+            ['SHOW VIEW'],
+            ['CREATE ROUTINE'],
+            ['ALTER ROUTINE'],
+            ['EVENT'],
+            ['TRIGGER'],
+        ];
+        $accessibleDbs = ['some_db', 'name', 'another_db'];
+
+        $pdo->expects($this->atLeastOnce())
             ->method('fetchAll')
-            ->willReturn(
+            ->willReturnMap(
                 [
-                    ['SELECT'],
-                    ['INSERT'],
-                    ['UPDATE'],
-                    ['DELETE'],
-                    ['CREATE'],
-                    ['DROP'],
-                    ['REFERENCES'],
-                    ['INDEX'],
-                    ['ALTER'],
-                    ['CREATE TEMPORARY TABLES'],
-                    ['LOCK TABLES'],
-                    ['EXECUTE'],
-                    ['CREATE VIEW'],
-                    ['SHOW VIEW'],
-                    ['CREATE ROUTINE'],
-                    ['ALTER ROUTINE'],
-                    ['EVENT'],
-                    ['TRIGGER'],
+                    [\PDO::FETCH_COLUMN, 0, $accessibleDbs],
+                    [\PDO::FETCH_NUM, null, $listOfPrivileges]
                 ]
             );
         $this->assertEquals(true, $this->dbValidator->checkDatabaseConnection('name', 'host', 'user', 'password'));
@@ -90,7 +97,41 @@ public function testCheckDatabaseConnectionNotEnoughPrivileges()
             ->expects($this->atLeastOnce())
             ->method('query')
             ->willReturn($pdo);
-        $pdo->expects($this->atLeastOnce())->method('fetchAll')->willReturn([['SELECT']]);
+        $listOfPrivileges = [['SELECT']];
+        $accessibleDbs = ['some_db', 'name', 'another_db'];
+
+        $pdo->expects($this->atLeastOnce())
+            ->method('fetchAll')
+            ->willReturnMap(
+                [
+                    [\PDO::FETCH_COLUMN, 0, $accessibleDbs],
+                    [\PDO::FETCH_NUM, null, $listOfPrivileges]
+                ]
+            );
+        $this->dbValidator->checkDatabaseConnection('name', 'host', 'user', 'password');
+    }
+
+    /**
+     * @expectedException \Magento\Setup\Exception
+     * @expectedExceptionMessage Database 'name' does not exist or specified database server user does not have
+     */
+    public function testCheckDatabaseConnectionDbNotAccessible()
+    {
+        $this->connection
+            ->expects($this->once())
+            ->method('fetchOne')
+            ->with('SELECT version()')
+            ->willReturn('5.6.0-0ubuntu0.12.04.1');
+        $pdo = $this->getMockForAbstractClass('Zend_Db_Statement_Interface', [], '', false);
+        $this->connection
+            ->expects($this->atLeastOnce())
+            ->method('query')
+            ->willReturn($pdo);
+        $accessibleDbs = ['some_db', 'another_db'];
+
+        $pdo->expects($this->atLeastOnce())
+            ->method('fetchAll')
+            ->willReturn($accessibleDbs);
         $this->dbValidator->checkDatabaseConnection('name', 'host', 'user', 'password');
     }
 

setup/src/Magento/Setup/Validator/DbValidator.php

@@ -30,7 +30,7 @@ class DbValidator
 
     /**
      * Constructor
-     * 
+     *
      * @param ConnectionFactory $connectionFactory
      */
     public function __construct(ConnectionFactory $connectionFactory)
@@ -103,7 +103,30 @@ public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
             }
         }
 
-        return $this->checkDatabasePrivileges($connection, $dbName);
+        return $this->checkDatabaseName($connection, $dbName) && $this->checkDatabasePrivileges($connection, $dbName);
+    }
+
+    /**
+     * Checks if specified database exists and visible to current user
+     *
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
+     * @param string $dbName
+     * @return bool
+     * @throws \Magento\Setup\Exception
+     */
+    private function checkDatabaseName(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $dbName)
+    {
+        $query = "SHOW DATABASES";
+        $accessibleDbs = $connection->query($query)->fetchAll(\PDO::FETCH_COLUMN, 0);
+        foreach ($accessibleDbs as $accessibleDbName) {
+            if ($dbName == $accessibleDbName) {
+                return true;
+            }
+        }
+        throw new \Magento\Setup\Exception(
+            "Database '{$dbName}' does not exist "
+            ."or specified database server user does not have privileges to access this database."
+        );
     }
 
     /**
@@ -154,7 +177,7 @@ private function checkDatabasePrivileges(\Magento\Framework\DB\Adapter\AdapterIn
         }
 
         $errorMessage = 'Database user does not have enough privileges. Please make sure '
-            . implode(', ', $requiredPrivileges) . " privileges are granted to table '$dbName'.";
+            . implode(', ', $requiredPrivileges) . " privileges are granted to table '{$dbName}'.";
         throw new \Magento\Setup\Exception($errorMessage);
     }