Merge "rdbms: set the schema in the LBFactory local domain"

diff --combined includes/db/MWLBFactory.php
index 8d1f476,5607332..5c79117
--- 1/includes/db/MWLBFactory.php
--- 2/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@@ -46,7 -46,7 +46,7 @@@ abstract class MWLBFactory 
                $lbConf += [
                        'localDomain' => new DatabaseDomain(
                                $mainConfig->get( 'DBname' ),
-                               null,
+                               $mainConfig->get( 'DBmwschema' ),
                                $mainConfig->get( 'DBprefix' )
                        ),
                        'profiler' => Profiler::instance(),
@@@ -64,7 -64,7 +64,7 @@@
                // When making changes here, remember to also specify MediaWiki-specific options
                // for Database classes in the relevant Installer subclass.
                // Such as MysqlInstaller::openConnection and PostgresInstaller::openConnectionWithParams.
 -              if ( $lbConf['class'] === 'LBFactorySimple' ) {
 +              if ( $lbConf['class'] === Wikimedia\Rdbms\LBFactorySimple::class ) {
                        if ( isset( $lbConf['servers'] ) ) {
                                // Server array is already explicitly configured; leave alone
                        } elseif ( is_array( $mainConfig->get( 'DBservers' ) ) ) {
@@@ -132,7 -132,7 +132,7 @@@
                        if ( !isset( $lbConf['externalClusters'] ) ) {
                                $lbConf['externalClusters'] = $mainConfig->get( 'ExternalServers' );
                        }
 -              } elseif ( $lbConf['class'] === 'LBFactoryMulti' ) {
 +              } elseif ( $lbConf['class'] === Wikimedia\Rdbms\LBFactoryMulti::class ) {
                        if ( isset( $lbConf['serverTemplate'] ) ) {
                                if ( in_array( $lbConf['serverTemplate']['type'], $typesWithSchema, true ) ) {
                                        $lbConf['serverTemplate']['schema'] = $mainConfig->get( 'DBmwschema' );

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
index b5e1a80,89472e7..be80cc5
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
@@@ -72,9 -72,9 +72,9 @@@ class LoadBalancerSingle extends LoadBa
                return new static( [ 'connection' => $db ] + $params );
        }
  
-       protected function reallyOpenConnection( array $server, $dbNameOverride ) {
+       protected function reallyOpenConnection( array $server, DatabaseDomain $domainOverride ) {
                return $this->db;
        }
  }
  
 -class_alias( 'Wikimedia\Rdbms\LoadBalancerSingle', 'LoadBalancerSingle' );
 +class_alias( LoadBalancerSingle::class, 'LoadBalancerSingle' );