From 0d57b370dfe726af5f3ecf210f9f352ad9e26f0f Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 1 Aug 2018 10:18:08 +1000 Subject: [PATCH 1/1] Fix total breakage of SQLite web upgrade Partial revert of 8d61cf2793abd2, since LBFactoryTest.php passes without overriding selectDB() in the current master. It's unclear why it was necessary. Bug: T200861 Change-Id: I7c0560d7890616899297f81a227db98996d5cb7f (cherry picked from commit 7584bf22fb2bda3c66ecf50c1edaad904ee1a649) --- RELEASE-NOTES-1.31 | 1 + includes/libs/rdbms/database/DatabaseSqlite.php | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index cf103549a2..95ba836f6f 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -16,6 +16,7 @@ This is a security and maintenance release of the MediaWiki 1.31 branch. * (T197206) Fix performance regression when multiple DB used without caching. * (T197030) PHPSessionHandler: Suppress headers warnings in initialize(). * (T182377, T196793) Exif: Guard against uncountable tag values. +* (T200861) Fix total breakage of SQLite web upgrade. === Changes since MediaWiki 1.31.0-rc.2 === * (T195783) Initialize PSR-4 namespaces at same stage as normal autoloader. diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php index a6a153a387..f282b17a0f 100644 --- a/includes/libs/rdbms/database/DatabaseSqlite.php +++ b/includes/libs/rdbms/database/DatabaseSqlite.php @@ -220,10 +220,6 @@ class DatabaseSqlite extends Database { return false; } - public function selectDB( $db ) { - return false; // doesn't make sense - } - /** * @return string SQLite DB file path * @since 1.25 -- 2.20.1