From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 15 Sep 2016 17:51:13 +0000 (-0700)
Subject: Remove wfSetBit()/wfSetVar() calls in DatabaseBase
X-Git-Tag: 1.31.0-rc.0~5532^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=789a54a5f1da5c57ddccc6e0e48d7233c7c4ef6c;p=lhc%2Fweb%2Fwiklou.git

Remove wfSetBit()/wfSetVar() calls in DatabaseBase

Change-Id: I4f1269d3a4e26c766f181208942042fdf768e0af
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 917bc910dc..3597b7c8a7 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -412,18 +412,25 @@ abstract class DatabaseBase implements IDatabase, LoggerAwareInterface {
 	 *   - false to disable debugging
 	 *   - omitted or null to do nothing
 	 *
-	 * @return bool|null Previous value of the flag
+	 * @return bool Previous value of the flag
+	 * @deprecated since 1.28; use setFlag()
 	 */
 	public function debug( $debug = null ) {
-		return wfSetBit( $this->mFlags, DBO_DEBUG, $debug );
+		$res = $this->getFlag( DBO_DEBUG );
+		if ( $debug !== null ) {
+			$debug ? $this->setFlag( DBO_DEBUG ) : $this->clearFlag( DBO_DEBUG );
+		}
+
+		return $res;
 	}
 
 	public function bufferResults( $buffer = null ) {
-		if ( is_null( $buffer ) ) {
-			return !(bool)( $this->mFlags & DBO_NOBUFFER );
-		} else {
-			return !wfSetBit( $this->mFlags, DBO_NOBUFFER, !$buffer );
+		$res = !$this->getFlag( DBO_NOBUFFER );
+		if ( $buffer !== null ) {
+			$buffer ? $this->clearFlag( DBO_NOBUFFER ) : $this->setFlag( DBO_NOBUFFER );
 		}
+
+		return $res;
 	}
 
 	/**
@@ -439,7 +446,12 @@ abstract class DatabaseBase implements IDatabase, LoggerAwareInterface {
 	 * @return bool The previous value of the flag.
 	 */
 	protected function ignoreErrors( $ignoreErrors = null ) {
-		return wfSetBit( $this->mFlags, DBO_IGNORE, $ignoreErrors );
+		$res = $this->getFlag( DBO_IGNORE );
+		if ( $ignoreErrors !== null ) {
+			$ignoreErrors ? $this->setFlag( DBO_IGNORE ) : $this->clearFlag( DBO_IGNORE );
+		}
+
+		return $res;
 	}
 
 	public function trxLevel() {
@@ -451,11 +463,17 @@ abstract class DatabaseBase implements IDatabase, LoggerAwareInterface {
 	}
 
 	public function tablePrefix( $prefix = null ) {
-		return wfSetVar( $this->mTablePrefix, $prefix );
+		$old = $this->mTablePrefix;
+		$this->mTablePrefix = $prefix;
+
+		return $old;
 	}
 
 	public function dbSchema( $schema = null ) {
-		return wfSetVar( $this->mSchema, $schema );
+		$old = $this->mSchema;
+		$this->mSchema = $schema;
+
+		return $old;
 	}
 
 	/**
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 59c8952249..4ffafdeab7 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -165,7 +165,7 @@ class DatabaseMssql extends Database {
 	 * @throws DBUnexpectedError
 	 */
 	protected function doQuery( $sql ) {
-		if ( $this->debug() ) {
+		if ( $this->getFlag( DBO_DEBUG ) ) {
 			wfDebug( "SQL: [$sql]\n" );
 		}
 		$this->offset = 0;