From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Aug 2018 07:27:27 +0000 (-0700)
Subject: rdbms: Disable DBConnRef::selectDB() for sanity
X-Git-Tag: 1.34.0-rc.0~4417^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%22http:/wikimediafoundation.org/fundraising/%7B%7B%20url_for%28%27user_settings%27%2C%20userid=session.userid%29%20%7D%7D?a=commitdiff_plain;h=5891967297a5e1f69925baacbf0c3a4ed13291d6;p=lhc%2Fweb%2Fwiklou.git

rdbms: Disable DBConnRef::selectDB() for sanity

Bug: T193565
Change-Id: I4276d1a7d77a019e0e60dab4b9ec36c93e418037
---

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index 7cb0604e51..eba1657f29 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -371,7 +371,8 @@ class DBConnRef implements IDatabase {
 	}
 
 	public function selectDB( $db ) {
-		return $this->__call( __FUNCTION__, func_get_args() );
+		// Disallow things that might confuse the LoadBalancer tracking
+		throw new DBUnexpectedError( $this, "Database selection is disallowed to enable reuse." );
 	}
 
 	public function getDBname() {