From 9703e5d6e24fb8df2778c5d687128f90079aa023 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 7 Mar 2010 08:03:45 +0000
Subject: #715476 by Jeremy and Crell: Schema object should respect active
 database connection (with tests).

---
 includes/database/mysql/database.inc | 2 ++
 includes/database/mysql/schema.inc   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'includes/database/mysql')

diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 46acb4dda..249db5234 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -25,6 +25,8 @@ class DatabaseConnection_mysql extends DatabaseConnection {
       $connection_options['port'] = 3306;
     }
 
+    $this->connectionOptions = $connection_options;
+
     $dsn = 'mysql:host=' . $connection_options['host'] . ';port=' . $connection_options['port'] . ';dbname=' . $connection_options['database'];
     parent::__construct($dsn, $connection_options['username'], $connection_options['password'], array(
       // So we don't have to mess around with cursors and unbuffered queries by default.
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc
index ee2b3d373..0d3166f48 100644
--- a/includes/database/mysql/schema.inc
+++ b/includes/database/mysql/schema.inc
@@ -33,13 +33,13 @@ class DatabaseSchema_mysql extends DatabaseSchema {
    * from the condition criteria.
    */
   protected function buildTableNameCondition($table_name, $operator = '=') {
-    $info = Database::getConnectionInfo();
+    $info = $this->connection->getConnectionOptions();
 
     if (strpos($table_name, '.')) {
       list($schema, $table_name) = explode('.', $table_name);
     }
     else {
-      $schema = $info['default']['database'];
+      $schema = $info['database'];
     }
 
     $condition = new DatabaseCondition('AND');
-- 
cgit v1.2.3