Revert "Issue #2176621 by sun, alexpott: Remove global $databases." Broke testbots

This reverts commit 06e6e923.

core/includes/bootstrap.inc

@@ -491,8 +491,7 @@ function drupal_valid_http_host($host) {
  */
 function drupal_settings_initialize() {
   // Export these settings.php variables to the global namespace.
-  global $base_url, $cookie_domain, $config_directories, $config;
-  $databases = array();
+  global $base_url, $databases, $cookie_domain, $config_directories, $config;
   $settings = array();
   $config = array();
 
@@ -501,8 +500,6 @@ function drupal_settings_initialize() {
   if (is_readable(DRUPAL_ROOT . '/' . $conf_path . '/settings.php')) {
     require DRUPAL_ROOT . '/' . $conf_path . '/settings.php';
   }
-  // Initialize Database.
-  Database::setMultipleConnectionInfo($databases);
   // Initialize Settings.
   new Settings($settings);
 }
@@ -1774,7 +1771,7 @@ function _drupal_bootstrap_configuration() {
   // Redirect the user to the installation script if Drupal has not been
   // installed yet (i.e., if no $databases array has been defined in the
   // settings.php file) and we are not already installing.
-  if (!Database::getConnectionInfo() && !drupal_installation_attempted() && !drupal_is_cli()) {
+  if (empty($GLOBALS['databases']) && !drupal_installation_attempted() && !drupal_is_cli()) {
     include_once __DIR__ . '/install.inc';
     install_goto('core/install.php');
   }

core/includes/install.core.inc

@@ -511,7 +511,7 @@ function install_begin_request(&$install_state) {
     $task = NULL;
 
     // Do not install over a configured settings.php.
-    if (Database::getConnectionInfo()) {
+    if (!empty($GLOBALS['databases'])) {
       throw new Exception(install_already_done_error());
     }
   }
@@ -1075,8 +1075,9 @@ function install_verify_completed_task() {
  * Verifies that settings.php specifies a valid database connection.
  */
 function install_verify_database_settings() {
-  if ($database = Database::getConnectionInfo()) {
-    $database = $database['default'];
+  global $databases;
+  if (!empty($databases)) {
+    $database = $databases['default']['default'];
     $settings_file = './' . conf_path(FALSE) . '/settings.php';
     $errors = install_database_errors($database, $settings_file);
     if (empty($errors)) {
@@ -1097,6 +1098,8 @@ function install_verify_database_settings() {
  * @ingroup forms
  */
 function install_settings_form($form, &$form_state, &$install_state) {
+  global $databases;
+
   $conf_path = './' . conf_path(FALSE);
   $settings_file = $conf_path . '/settings.php';
 
@@ -1105,33 +1108,25 @@ function install_settings_form($form, &$form_state, &$install_state) {
   $drivers = drupal_get_database_types();
   $drivers_keys = array_keys($drivers);
 
-  // Unless there is input for this form (for a non-interactive installation,
-  // input originates from the $settings array passed into install_drupal()),
-  // check whether database connection settings have been prepared in
-  // settings.php already.
+  // If database connection settings have been prepared in settings.php already,
+  // then the existing values need to be taken over.
   // Note: The installer even executes this form if there is a valid database
   // connection already, since the submit handler of this form is responsible
   // for writing all $settings to settings.php (not limited to $databases).
-  if (!isset($form_state['input']['driver']) && $database = Database::getConnectionInfo()) {
-    $form_state['input']['driver'] = $database['default']['driver'];
-    $form_state['input'][$database['default']['driver']] = $database['default'];
-  }
-
-  if (isset($form_state['input']['driver'])) {
+  if (isset($databases['default']['default'])) {
+    $default_driver = $databases['default']['default']['driver'];
+    $default_options = $databases['default']['default'];
+  }
+  // Otherwise, use the database connection settings from the form input.
+  // For a non-interactive installation, this is derived from the original
+  // $settings array passed into install_drupal().
+  elseif (isset($form_state['input']['driver'])) {
     $default_driver = $form_state['input']['driver'];
-    // In case of database connection info from settings.php, as well as for a
-    // programmed form submission (non-interactive installer), the table prefix
-    // information is usually normalized into an array already, but the form
-    // element only allows to configure one default prefix for all tables.
-    $prefix = &$form_state['input'][$default_driver]['prefix'];
-    if (isset($prefix) && is_array($prefix)) {
-      $prefix = $prefix['default'];
-    }
     $default_options = $form_state['input'][$default_driver];
   }
-  // If there is no database information yet, suggest the first available driver
-  // as default value, so that its settings form is made visible via #states
-  // when JavaScript is enabled (see below).
+  // If there is no database information at all yet, just suggest the first
+  // available driver as default value, so that its settings form is made
+  // visible via #states when JavaScript is enabled (see below).
   else {
     $default_driver = current($drivers_keys);
     $default_options = array();
@@ -1207,6 +1202,7 @@ function install_settings_form_validate($form, &$form_state) {
  * Checks a database connection and returns any errors.
  */
 function install_database_errors($database, $settings_file) {
+  global $databases;
   $errors = array();
 
   // Check database type.
@@ -1218,13 +1214,18 @@ function install_database_errors($database, $settings_file) {
   else {
     // Run driver specific validation
     $errors += $database_types[$driver]->validateDatabaseSettings($database);
-    if (!empty($errors)) {
-      // No point to try further.
-      return $errors;
-    }
+
     // Run tasks associated with the database type. Any errors are caught in the
     // calling function.
-    Database::addConnectionInfo('default', 'default', $database);
+    $databases['default']['default'] = $database;
+    // Just changing the global doesn't get the new information processed.
+    // We need to close any active connections and tell the Database class to
+    // re-parse $databases.
+    if (Database::isActiveConnection()) {
+      Database::closeConnection();
+    }
+    Database::parseConnectionInfo();
+
     try {
       db_run_tasks($driver);
     }

core/modules/migrate/lib/Drupal/migrate/Tests/MigrateTestBase.php

@@ -40,7 +40,7 @@ protected function prepare(MigrationInterface $migration, array $files = array()
     $database = SqlBase::getDatabaseConnection($migration->id(), array('database' => $connection_info['default']));
     foreach (array('source', 'destination', 'idMap') as $key) {
       $configuration = $migration->get($key);
-      $configuration['database'] = $connection_info['default'];
+      $configuration['database'] = $database;
       $migration->set($key, $configuration);
     }
 

core/modules/simpletest/lib/Drupal/simpletest/TestBase.php

@@ -933,11 +933,7 @@ private function changeDatabasePrefix() {
     $connection_info = Database::getConnectionInfo('default');
     Database::renameConnection('default', 'simpletest_original_default');
     foreach ($connection_info as $target => $value) {
-      // Replace the full table prefix definition to ensure that no table
-      // prefixes of the test runner leak into the test.
-      $connection_info[$target]['prefix'] = array(
-        'default' => $value['prefix']['default'] . $this->databasePrefix,
-      );
+      $connection_info[$target]['prefix'] = $value['prefix']['default'] . $this->databasePrefix;
     }
     Database::addConnectionInfo('default', 'default', $connection_info['default']);
   }
@@ -1172,10 +1168,11 @@ private function restoreEnvironment() {
     usleep(50000);
 
     // Remove all prefixed tables.
+    // @todo Connection prefix info is not normalized into an array.
     $original_connection_info = Database::getConnectionInfo('simpletest_original_default');
-    $original_prefix = $original_connection_info['default']['prefix']['default'];
+    $original_prefix = is_array($original_connection_info['default']['prefix']) ? $original_connection_info['default']['prefix']['default'] : $original_connection_info['default']['prefix'];
     $test_connection_info = Database::getConnectionInfo('default');
-    $test_prefix = $test_connection_info['default']['prefix']['default'];
+    $test_prefix = is_array($test_connection_info['default']['prefix']) ? $test_connection_info['default']['prefix']['default'] : $test_connection_info['default']['prefix'];
     if ($original_prefix != $test_prefix) {
       $tables = Database::getConnection()->schema()->findTables($test_prefix . '%');
       $prefix_length = strlen($test_prefix);
@@ -1196,6 +1193,10 @@ private function restoreEnvironment() {
     // Restore original database connection.
     Database::removeConnection('default');
     Database::renameConnection('simpletest_original_default', 'default');
+    // @see TestBase::changeDatabasePrefix()
+    global $databases;
+    $connection_info = Database::getConnectionInfo('default');
+    $databases['default']['default'] = $connection_info['default'];
 
     // Restore original globals.
     if (isset($this->originalThemeKey)) {

core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php

@@ -892,7 +892,6 @@ protected function setUp() {
   protected function installParameters() {
     $connection_info = Database::getConnectionInfo();
     $driver = $connection_info['default']['driver'];
-    $connection_info['default']['prefix'] = $connection_info['default']['prefix']['default'];
     unset($connection_info['default']['driver']);
     unset($connection_info['default']['namespace']);
     unset($connection_info['default']['pdo']);

core/modules/system/lib/Drupal/system/Tests/Database/ConnectionUnitTest.php

@@ -52,6 +52,8 @@ function setUp() {
     // and closed in this test.
     // @see TestBase::changeDatabasePrefix()
     Database::addConnectionInfo('default', 'monitor', $connection_info['default']);
+    global $databases;
+    $databases['default']['monitor'] = $connection_info['default'];
     $this->monitor = Database::getConnection('monitor');
   }