X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=maintenance%2FmigrateUserGroup.php;h=396be1d7ea4cdc8a421f2a3f49ce2d9132daaefc;hb=cba9d9c41dee8a4fcaf5600e4cf8ca8e4f777908;hp=496af7237b8b449fec4638427506d4c0aa98a11e;hpb=67e23ec357d2265bc487bdd4b63e30fcaf5871c7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 496af7237b..396be1d7ea 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script that re-assigns users from an old group to a new one.
@@ -31,7 +31,7 @@ require_once( __DIR__ . '/Maintenance.php' );
 class MigrateUserGroup extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Re-assign users from an old group to a new one";
+		$this->addDescription( 'Re-assign users from an old group to a new one' );
 		$this->addArg( 'oldgroup', 'Old user group key', true );
 		$this->addArg( 'newgroup', 'New user group key', true );
 		$this->setBatchSize( 200 );
@@ -41,11 +41,11 @@ class MigrateUserGroup extends Maintenance {
 		$count = 0;
 		$oldGroup = $this->getArg( 0 );
 		$newGroup = $this->getArg( 1 );
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->getDB( DB_MASTER );
 		$start = $dbw->selectField( 'user_groups', 'MIN(ug_user)',
-			array( 'ug_group' => $oldGroup ), __FUNCTION__ );
+			[ 'ug_group' => $oldGroup ], __FUNCTION__ );
 		$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
-			array( 'ug_group' => $oldGroup ), __FUNCTION__ );
+			[ 'ug_group' => $oldGroup ], __FUNCTION__ );
 		if ( $start === null ) {
 			$this->error( "Nothing to do - no users in the '$oldGroup' group", true );
 		}
@@ -55,30 +55,55 @@ class MigrateUserGroup extends Maintenance {
 		$blockEnd = $start + $this->mBatchSize - 1;
 		// Migrate users over in batches...
 		while ( $blockEnd <= $end ) {
+			$affected = 0;
 			$this->output( "Doing users $blockStart to $blockEnd\n" );
-			$dbw->begin( __METHOD__ );
+
+			$this->beginTransaction( $dbw, __METHOD__ );
 			$dbw->update( 'user_groups',
-				array( 'ug_group' => $newGroup ),
-				array( 'ug_group' => $oldGroup,
-					"ug_user BETWEEN $blockStart AND $blockEnd" ),
+				[ 'ug_group' => $newGroup ],
+				[ 'ug_group' => $oldGroup,
+					"ug_user BETWEEN $blockStart AND $blockEnd" ],
 				__METHOD__,
-				array( 'IGNORE' )
+				[ 'IGNORE' ]
 			);
-			$count += $dbw->affectedRows();
+			$affected += $dbw->affectedRows();
+			// Delete rows that the UPDATE operation above had to ignore.
+			// This happens when a user is in both the old and new group.
+			// Updating the row for the old group membership failed since
+			// user/group is UNIQUE.
 			$dbw->delete( 'user_groups',
-				array( 'ug_group' => $oldGroup,
-					"ug_user BETWEEN $blockStart AND $blockEnd" ),
+				[ 'ug_group' => $oldGroup,
+					"ug_user BETWEEN $blockStart AND $blockEnd" ],
 				__METHOD__
 			);
-			$count += $dbw->affectedRows();
-			$dbw->commit( __METHOD__ );
+			$affected += $dbw->affectedRows();
+			$this->commitTransaction( $dbw, __METHOD__ );
+
+			// Clear cache for the affected users (bug 40340)
+			if ( $affected > 0 ) {
+				// XXX: This also invalidates cache of unaffected users that
+				// were in the new group and not in the group.
+				$res = $dbw->select( 'user_groups', 'ug_user',
+					[ 'ug_group' => $newGroup,
+						"ug_user BETWEEN $blockStart AND $blockEnd" ],
+					__METHOD__
+				);
+				if ( $res !== false ) {
+					foreach ( $res as $row ) {
+						$user = User::newFromId( $row->ug_user );
+						$user->invalidateCache();
+					}
+				}
+			}
+
+			$count += $affected;
 			$blockStart += $this->mBatchSize;
 			$blockEnd += $this->mBatchSize;
 			wfWaitForSlaves();
 		}
-		$this->output( "Done! $count user(s) in group '$oldGroup' are now in '$newGroup' instead.\n" );
+		$this->output( "Done! $count users in group '$oldGroup' are now in '$newGroup' instead.\n" );
 	}
 }
 
 $maintClass = "MigrateUserGroup";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;