Merge "Remove incorrect timezone conversion from date parameters"

[lhc/web/wiklou.git] / includes / installer / SqliteInstaller.php

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index d60d801..aa95438 100644 (file)
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -33,7 +33,8 @@ use Wikimedia\Rdbms\DBConnectionError;
  */
 class SqliteInstaller extends DatabaseInstaller {
 
-       public $minimumVersion = '3.3.7';
+       public static $minimumVersion = '3.3.7';
+       protected static $notMiniumumVerisonMessage = 'config-outdated-sqlite';
 
        /**
         * @var DatabaseSqlite
@@ -58,12 +59,9 @@ class SqliteInstaller extends DatabaseInstaller {
         * @return Status
         */
        public function checkPrerequisites() {
-               $result = Status::newGood();
                // Bail out if SQLite is too old
                $db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
-               if ( version_compare( $db->getServerVersion(), $this->minimumVersion, '<' ) ) {
-                       $result->fatal( 'config-outdated-sqlite', $db->getServerVersion(), $this->minimumVersion );
-               }
+               $result = static::meetsMinimumRequirement( $db->getServerVersion() );
                // Check for FTS3 full-text search module
                if ( DatabaseSqlite::getFulltextSearchModule() != 'FTS3' ) {
                        $result->warning( 'config-no-fts3' );
@@ -162,9 +160,9 @@ class SqliteInstaller extends DatabaseInstaller {
                        # Called early on in the installer, later we just want to sanity check
                        # if it's still writable
                        if ( $create ) {
-                               MediaWiki\suppressWarnings();
+                               Wikimedia\suppressWarnings();
                                $ok = wfMkdirParents( $dir, 0700, __METHOD__ );
-                               MediaWiki\restoreWarnings();
+                               Wikimedia\restoreWarnings();
                                if ( !$ok ) {
                                        return Status::newFatal( 'config-sqlite-mkdir-error', $dir );
                                }
@@ -232,6 +230,7 @@ class SqliteInstaller extends DatabaseInstaller {
                $status = Status::newGood();
                $status->merge( $this->makeStubDBFile( $dir, $db ) );
                $status->merge( $this->makeStubDBFile( $dir, "wikicache" ) );
+               $status->merge( $this->makeStubDBFile( $dir, "{$db}_l10n_cache" ) );
                if ( !$status->isOK() ) {
                        return $status;
                }
@@ -244,7 +243,8 @@ class SqliteInstaller extends DatabaseInstaller {
 
                # Create the global cache DB
                try {
-                       $conn = Database::factory( 'sqlite', [ 'dbname' => 'wikicache', 'dbDirectory' => $dir ] );
+                       $conn = Database::factory(
+                               'sqlite', [ 'dbname' => 'wikicache', 'dbDirectory' => $dir ] );
                        # @todo: don't duplicate objectcache definition, though it's very simple
                        $sql =
 <<<EOT
@@ -262,6 +262,27 @@ EOT;
                        return Status::newFatal( 'config-sqlite-connection-error', $e->getMessage() );
                }
 
+               # Create the l10n cache DB
+               try {
+                       $conn = Database::factory(
+                               'sqlite', [ 'dbname' => "{$db}_l10n_cache", 'dbDirectory' => $dir ] );
+                       # @todo: don't duplicate l10n_cache definition, though it's very simple
+                       $sql =
+<<<EOT
+       CREATE TABLE l10n_cache (
+               lc_lang BLOB NOT NULL,
+               lc_key TEXT NOT NULL,
+               lc_value BLOB NOT NULL,
+               PRIMARY KEY (lc_lang, lc_key)
+       );
+EOT;
+                       $conn->query( $sql );
+                       $conn->query( "PRAGMA journal_mode=WAL" ); // this is permanent
+                       $conn->close();
+               } catch ( DBConnectionError $e ) {
+                       return Status::newFatal( 'config-sqlite-connection-error', $e->getMessage() );
+               }
+
                # Open the main DB
                return $this->getConnection();
        }
@@ -323,7 +344,7 @@ EOT;
                return "# SQLite-specific settings
 \$wgSQLiteDataDir = \"{$dir}\";
 \$wgObjectCaches[CACHE_DB] = [
-       'class' => 'SqlBagOStuff',
+       'class' => SqlBagOStuff::class,
        'loggroup' => 'SQLBagOStuff',
        'server' => [
                'type' => 'sqlite',
@@ -332,6 +353,13 @@ EOT;
                'dbDirectory' => \$wgSQLiteDataDir,
                'flags' => 0
        ]
+];
+\$wgLocalisationCacheConf['storeServer'] = [
+       'type' => 'sqlite',
+       'dbname' => \"{\$wgDBname}_l10n_cache\",
+       'tablePrefix' => '',
+       'dbDirectory' => \$wgSQLiteDataDir,
+       'flags' => 0
 ];";
        }
 }