X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Flibs%2Frdbms%2Floadbalancer%2FLoadBalancerSingle.php;h=2161b662f5f45b55c1221a2e460a666228558a5e;hb=f4a5de374068b712992d8ca273c5db15b8041dd0;hp=1b72502b14e48d11744997feb0d86d3e063028d9;hpb=284bc0b5eb1c0e47d7100d5604ab4d5180dcd8d5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
index 1b72502b14..a3e57aefcf 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
@@ -26,7 +26,7 @@ namespace Wikimedia\Rdbms;
 use InvalidArgumentException;
 
 /**
- * Trivial LoadBalancer that always returns an injected connection handle
+ * Trivial LoadBalancer that always returns an injected connection handle.
  */
 class LoadBalancerSingle extends LoadBalancer {
 	/** @var IDatabase */
@@ -54,7 +54,9 @@ class LoadBalancerSingle extends LoadBalancer {
 			],
 			'trxProfiler' => $params['trxProfiler'] ?? null,
 			'srvCache' => $params['srvCache'] ?? null,
-			'wanCache' => $params['wanCache'] ?? null
+			'wanCache' => $params['wanCache'] ?? null,
+			'localDomain' => $params['localDomain'] ?? $this->db->getDomainID(),
+			'readOnlyReason' => $params['readOnlyReason'] ?? false,
 		] );
 
 		if ( isset( $params['readOnlyReason'] ) ) {
@@ -69,12 +71,20 @@ class LoadBalancerSingle extends LoadBalancer {
 	 * @since 1.28
 	 */
 	public static function newFromConnection( IDatabase $db, array $params = [] ) {
-		return new static( [ 'connection' => $db ] + $params );
+		return new static( array_merge(
+			[ 'localDomain' => $db->getDomainID() ],
+			$params,
+			[ 'connection' => $db ]
+		) );
 	}
 
-	protected function reallyOpenConnection( array $server, DatabaseDomain $domainOverride ) {
+	protected function reallyOpenConnection( array $server, DatabaseDomain $domain ) {
 		return $this->db;
 	}
+
+	public function __destruct() {
+		// do nothing since the connection was injected
+	}
 }
 
 /**