Merge remote-tracking branch 'origin/B2B-1986-PR' into B2B-2079-combined

Author: avattam06

dev/tests/setup-integration/etc/install-config-mysql.php.dist

@@ -10,6 +10,7 @@ return [
         'db-user' => '{{db-user}}',
         'db-password' => '{{db-password}}',
         'db-name' => '{{db-name}}',
+        'db-init-statements' => '{{db-init-statements}}',
         'db-prefix' => '',
         'backend-frontname' => 'admin',
         'admin-user' => 'admin',

dev/tests/setup-integration/framework/bootstrap.php

@@ -83,7 +83,10 @@
     $application->createInstallDir();
     //We do not want to install anything
     $application->initialize([]);
-    $application->cleanup();
+
+    if ($settings->getAsBoolean('TESTS_CLEANUP')) {
+        $application->cleanup();
+    }
 
     \Magento\TestFramework\Helper\Bootstrap::setInstance(new \Magento\TestFramework\Helper\Bootstrap($bootstrap));
 

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

@@ -141,17 +141,15 @@ public function checkDatabaseConnectionWithDriverOptions(
      */
     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;
-            }
+        try {
+            $connection->query("SHOW TABLES FROM $dbName")->fetchAll(\PDO::FETCH_COLUMN, 0);
+            return true;
+        } catch (\Exception $e) {
+            throw new \Magento\Setup\Exception(
+                "Database '{$dbName}' does not exist "
+                . "or specified database server user does not have privileges to access this database."
+            );
         }
-        throw new \Magento\Setup\Exception(
-            "Database '{$dbName}' does not exist "
-            ."or specified database server user does not have privileges to access this database."
-        );
     }
 
     /**