From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 1 Apr 2019 21:39:36 +0000 (-0700)
Subject: rdbms: make $wgSQLMode work as documented when it is NULL
X-Git-Tag: 1.34.0-rc.0~2200^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=1a6aad9929bc7d942a3f574f01360d41aaac551e;p=lhc%2Fweb%2Fwiklou.git

rdbms: make $wgSQLMode work as documented when it is NULL

NULL means that the SET query should not be sent.
This was broken since 5bc9b990acd0e0302f.

Change-Id: I148b1153ef6ecca99c56e4f63247820a766ae779
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 7fccd57f45..36c947f6eb 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -106,7 +106,7 @@ abstract class DatabaseMysqlBase extends Database {
 				$this->$var = $params[$var];
 			}
 		}
-		$this->sqlMode = $params['sqlMode'] ?? '';
+		$this->sqlMode = $params['sqlMode'] ?? null;
 		$this->utf8Mode = !empty( $params['utf8Mode'] );
 		$this->insertSelectIsSafe = isset( $params['insertSelectIsSafe'] )
 			? (bool)$params['insertSelectIsSafe'] : null;