1.1.3 (Use separate DB connection when creating an incremental ID)

Author: gesinn-it-wam

IDProvider.functions.php

@@ -8,7 +8,7 @@
  * @file
  * @ingroup Extensions
  */
- 
+
  class IDProviderFunctions {
 
 
@@ -95,11 +95,10 @@ private static function calculateIncrement($prefix) {
         // Get DB with read access
         // > MW 1.27
         if ( class_exists( '\MediaWiki\MediaWikiServices' ) && method_exists( '\MediaWiki\MediaWikiServices', 'getDBLoadBalancerFactory' ) ) {
-            $factory = \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-            $mainLB = $factory->getMainLB();
-            $dbw = $mainLB->getConnectionRef( DB_MASTER );
-            $factory->beginMasterChanges(__METHOD__);
-        } else {        
+			$lb = \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->newMainLB();
+			$dbw = $lb->getConnection( DB_MASTER );
+			$dbw->clearFlag( DBO_TRX );
+        } else {
             $dbw = wfGetDB(DB_MASTER);
             $dbw->begin();
         }
@@ -125,7 +124,7 @@ private static function calculateIncrement($prefix) {
 			);
             // > MW 1.27
             if ( class_exists( '\MediaWiki\MediaWikiServices' ) && method_exists( '\MediaWiki\MediaWikiServices', 'getDBLoadBalancerFactory' ) ) {
-                $factory->commitMasterChanges(__METHOD__); 
+				$lb->disable();
             } else {
             	$dbw->commit();
             }
@@ -149,12 +148,12 @@ private static function calculateIncrement($prefix) {
 			);
             // > MW 1.27
             if ( class_exists( '\MediaWiki\MediaWikiServices' ) && method_exists( '\MediaWiki\MediaWikiServices', 'getDBLoadBalancerFactory' ) ) {
-                $factory->commitMasterChanges(__METHOD__); 
+				$lb->disable();
             } else {
             	$dbw->commit();
             }
-		}     
-        
+		}
+
 		if (!$increment) {
 			throw new Exception('Could not calculate the increment!');
 		}
@@ -415,4 +414,4 @@ public static function toJSON($obj) {
 		die();
 	}
 
-}
+}

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "IDProvider",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "author": [
         "Simon Heimler",
         "Alexander Gesinn (gesinn.it GmbH & Co. KG)"
@@ -9,12 +9,12 @@
     "descriptionmsg": "idprovider-desc",
     "license-name": "MIT",
     "type": "other",
-    
+
     "APIModules": {
         "idprovider-increment": "IDProviderIncrementApi",
         "idprovider-random": "IDProviderRandomApi"
     },
-    
+
     "AutoloadClasses": {
         "IDProviderHooks": "IDProvider.hooks.php",
         "IDProviderFunctions": "IDProvider.functions.php",
@@ -47,6 +47,6 @@
         "IDProviderMaxRandNumber ": 9999999999,
         "IDProviderRandStringLength ": 12
     },
-    
+
     "manifest_version": 1
-}
+}