X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdb%2FMWLBFactory.php;h=18030090dfd2140e37f1360f8e3876deb2bd1ab6;hb=eb70451cec6409526c8feaedf55700f51e10ffe7;hp=0c17840e4a178a132819df2014d907433b4475e1;hpb=8943c8cc68e64fcfc8d537ed6c139a6f4d0106d3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 0c17840e4a..18030090df 100644
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -66,7 +66,7 @@ abstract class MWLBFactory {
 	 * @param array $lbConf Config for LBFactory::__construct()
 	 * @param ServiceOptions $options
 	 * @param ConfiguredReadOnlyMode $readOnlyMode
-	 * @param BagOStuff $srvCace
+	 * @param BagOStuff $srvCache
 	 * @param BagOStuff $mainStash
 	 * @param WANObjectCache $wanCache
 	 * @return array
@@ -76,7 +76,7 @@ abstract class MWLBFactory {
 		array $lbConf,
 		ServiceOptions $options,
 		ConfiguredReadOnlyMode $readOnlyMode,
-		BagOStuff $srvCace,
+		BagOStuff $srvCache,
 		BagOStuff $mainStash,
 		WANObjectCache $wanCache
 	) {
@@ -159,7 +159,7 @@ abstract class MWLBFactory {
 			$options->get( 'DBprefix' )
 		);
 
-		$lbConf = self::injectObjectCaches( $lbConf, $srvCace, $mainStash, $wanCache );
+		$lbConf = self::injectObjectCaches( $lbConf, $srvCache, $mainStash, $wanCache );
 
 		return $lbConf;
 	}
@@ -168,7 +168,7 @@ abstract class MWLBFactory {
 	 * @return array
 	 */
 	private static function getDbTypesWithSchemas() {
-		return [ 'postgres', 'mssql' ];
+		return [ 'postgres' ];
 	}
 
 	/**
@@ -193,16 +193,6 @@ abstract class MWLBFactory {
 				// Work around the reserved word usage in MediaWiki schema
 				'keywordTableMap' => [ 'user' => 'mwuser', 'text' => 'pagecontent' ]
 			];
-		} elseif ( $server['type'] === 'oracle' ) {
-			$server += [
-				// Work around the reserved word usage in MediaWiki schema
-				'keywordTableMap' => [ 'user' => 'mwuser', 'text' => 'pagecontent' ]
-			];
-		} elseif ( $server['type'] === 'mssql' ) {
-			$server += [
-				'port' => $options->get( 'DBport' ),
-				'useWindowsAuth' => $options->get( 'DBWindowsAuthentication' )
-			];
 		}
 
 		if ( in_array( $server['type'], self::getDbTypesWithSchemas(), true ) ) {
@@ -232,6 +222,11 @@ abstract class MWLBFactory {
 	private static function injectObjectCaches(
 		array $lbConf, BagOStuff $sCache, BagOStuff $mStash, WANObjectCache $wCache
 	) {
+		// Fallback if APC style caching is not an option
+		if ( $sCache instanceof EmptyBagOStuff ) {
+			$sCache = new HashBagOStuff( [ 'maxKeys' => 100 ] );
+		}
+
 		// Use APC/memcached style caching, but avoids loops with CACHE_DB (T141804)
 		if ( $sCache->getQoS( $sCache::ATTR_EMULATION ) > $sCache::QOS_EMULATION_SQL ) {
 			$lbConf['srvCache'] = $sCache;