X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDBConnRef.php;h=acb21ed9b6817ee5e275ee9dcc545f5142c9e17e;hb=e626f8266eca6729e16fdac9e616c1e441d3013d;hp=eb0e954e169ac93541a45a0be94ed785b27b7c89;hpb=4a5f646a7fea7cbe0421c5cf38b72bae5c1bcf65;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index eb0e954e16..acb21ed9b6 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -23,16 +23,17 @@ class DBConnRef implements IDatabase {
 	const FLD_INDEX = 0;
 	const FLD_GROUP = 1;
 	const FLD_DOMAIN = 2;
+	const FLD_FLAGS = 3;
 
 	/**
 	 * @param ILoadBalancer $lb Connection manager for $conn
-	 * @param Database|array $conn New connection handle or (server index, query groups, domain)
+	 * @param Database|array $conn Database handle or (server index, query groups, domain, flags)
 	 */
 	public function __construct( ILoadBalancer $lb, $conn ) {
 		$this->lb = $lb;
 		if ( $conn instanceof Database ) {
 			$this->conn = $conn; // live handle
-		} elseif ( count( $conn ) >= 3 && $conn[self::FLD_DOMAIN] !== false ) {
+		} elseif ( count( $conn ) >= 4 && $conn[self::FLD_DOMAIN] !== false ) {
 			$this->params = $conn;
 		} else {
 			throw new InvalidArgumentException( "Missing lazy connection arguments." );
@@ -41,8 +42,8 @@ class DBConnRef implements IDatabase {
 
 	function __call( $name, array $arguments ) {
 		if ( $this->conn === null ) {
-			list( $db, $groups, $wiki ) = $this->params;
-			$this->conn = $this->lb->getConnection( $db, $groups, $wiki );
+			list( $db, $groups, $wiki, $flags ) = $this->params;
+			$this->conn = $this->lb->getConnection( $db, $groups, $wiki, $flags );
 		}
 
 		return call_user_func_array( [ $this->conn, $name ], $arguments );
@@ -280,7 +281,7 @@ class DBConnRef implements IDatabase {
 	}
 
 	public function estimateRowCount(
-		$table, $vars = '*', $conds = '', $fname = __METHOD__, $options = []
+		$table, $vars = '*', $conds = '', $fname = __METHOD__, $options = [], $join_conds = []
 	) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
@@ -349,10 +350,18 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
+	public function buildSubstring( $input, $startPosition, $length = null ) {
+		return $this->__call( __FUNCTION__, func_get_args() );
+	}
+
 	public function buildStringCast( $field ) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
+	public function buildIntegerCast( $field ) {
+		return $this->__call( __FUNCTION__, func_get_args() );
+	}
+
 	public function databasesAreIndependent() {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
@@ -609,6 +618,10 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
+	public function setIndexAliases( array $aliases ) {
+		return $this->__call( __FUNCTION__, func_get_args() );
+	}
+
 	/**
 	 * Clean up the connection when out of scope
 	 */