X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fobjectcache%2FSqlBagOStuff.php;h=70795eccd951a0b126117776b471f187d04e2d73;hb=12601ff7d2796752404bfb331fccc41083d31f9f;hp=141a375c623718b5cbeed48ff30d6c46c7a7fff9;hpb=0697e414854d42f22687c5e191e331ee06dc310c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index 141a375c62..70795eccd9 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -23,6 +23,9 @@
 
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\DBError;
+use Wikimedia\Rdbms\DBQueryError;
+use Wikimedia\Rdbms\DBConnectionError;
 use \MediaWiki\MediaWikiServices;
 use \Wikimedia\WaitConditionLoop;
 use \Wikimedia\Rdbms\TransactionProfiler;
@@ -145,7 +148,7 @@ class SqlBagOStuff extends BagOStuff {
 	protected function getSeparateMainLB() {
 		global $wgDBtype;
 
-		if ( $wgDBtype === 'mysql' && $this->usesMainDB() ) {
+		if ( $this->usesMainDB() && $wgDBtype !== 'sqlite' ) {
 			if ( !$this->separateMainLB ) {
 				// We must keep a separate connection to MySQL in order to avoid deadlocks
 				$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
@@ -153,8 +156,7 @@ class SqlBagOStuff extends BagOStuff {
 			}
 			return $this->separateMainLB;
 		} else {
-			// However, SQLite has an opposite behavior. And PostgreSQL needs to know
-			// if we are in transaction or not (@TODO: find some PostgreSQL work-around).
+			// However, SQLite has an opposite behavior due to DB-level locking
 			return null;
 		}
 	}
@@ -585,7 +587,7 @@ class SqlBagOStuff extends BagOStuff {
 					while ( true ) {
 						$conds = $baseConds;
 						if ( $maxExpTime !== false ) {
-							$conds[] = 'exptime > ' . $db->addQuotes( $maxExpTime );
+							$conds[] = 'exptime >= ' . $db->addQuotes( $maxExpTime );
 						}
 						$rows = $db->select(
 							$this->getTableNameByShard( $i ),