(no bug) Fix per-connection db name in ORMTable.

ORMTable was bypassing the mechanism used by DBAccessBase to
ensure that the correct database name is selected when getting
a database connection.

Change-Id: Ic82ce46f1852dcaa5f52b40660ba4a9f52df22f6

diff --git a/includes/db/ORMTable.php b/includes/db/ORMTable.php
index 13c2d9f..a2ef944 100644 (file)
--- a/includes/db/ORMTable.php
+++ b/includes/db/ORMTable.php
@@ -463,7 +463,7 @@ abstract class ORMTable extends DBAccessBase implements IORMTable {
         * @return DatabaseBase The database object
         */
        public function getReadDbConnection() {
-               return $this->getLoadBalancer()->getConnection( $this->getReadDb(), array(), $this->getTargetWiki() );
+               return $this->getConnection( $this->getReadDb(), array() );
        }
 
        /**
@@ -477,7 +477,7 @@ abstract class ORMTable extends DBAccessBase implements IORMTable {
         * @return DatabaseBase The database object
         */
        public function getWriteDbConnection() {
-               return $this->getLoadBalancer()->getConnection( DB_MASTER, array(), $this->getTargetWiki() );
+               return $this->getConnection( DB_MASTER, array() );
        }
 
        /**