Merge "Inject Profiler into Database objects"

[lhc/web/wiklou.git] / includes / libs / rdbms / database / Database.php

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 34b4b53..3672f4a 100644 (file)
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -112,6 +112,8 @@ abstract class Database implements IDatabase, LoggerAwareInterface {
        protected $htmlErrors;
        /** @var string */
        protected $delimiter = ';';
+       /** @var DatabaseDomain */
+       protected $currentDomain;
 
        /**
         * Either 1 if a transaction is active or 0 otherwise.
@@ -286,6 +288,10 @@ abstract class Database implements IDatabase, LoggerAwareInterface {
                if ( $user ) {
                        $this->open( $server, $user, $password, $dbName );
                }
+
+               $this->currentDomain = ( $this->mDBname != '' )
+                       ? new DatabaseDomain( $this->mDBname, null, $this->mTablePrefix )
+                       : DatabaseDomain::newUnspecified();
        }
 
        /**
@@ -440,6 +446,9 @@ abstract class Database implements IDatabase, LoggerAwareInterface {
                $old = $this->mTablePrefix;
                if ( $prefix !== null ) {
                        $this->mTablePrefix = $prefix;
+                       $this->currentDomain = ( $this->mDBname != '' )
+                               ? new DatabaseDomain( $this->mDBname, null, $this->mTablePrefix )
+                               : DatabaseDomain::newUnspecified();
                }
 
                return $old;
@@ -611,11 +620,7 @@ abstract class Database implements IDatabase, LoggerAwareInterface {
        }
 
        public function getDomainID() {
-               if ( $this->mTablePrefix != '' ) {
-                       return "{$this->mDBname}-{$this->mTablePrefix}";
-               } else {
-                       return $this->mDBname;
-               }
+               return $this->currentDomain->getId();
        }
 
        final public function getWikiID() {