From: Demon <chadh@wikimedia.org>
Date: Thu, 30 Aug 2012 20:20:59 +0000 (+0000)
Subject: Merge "Update migrateUserGroup to deal with primary key issue"
X-Git-Tag: 1.31.0-rc.0~22523
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=67e23ec357d2265bc487bdd4b63e30fcaf5871c7;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Update migrateUserGroup to deal with primary key issue"
---

67e23ec357d2265bc487bdd4b63e30fcaf5871c7
diff --combined maintenance/migrateUserGroup.php
index 497e1e0995,e6eea66722..496af7237b
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@@ -17,17 -17,11 +17,17 @@@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   * http://www.gnu.org/copyleft/gpl.html
   *
 + * @file
   * @ingroup Maintenance
   */
  
 -require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 +require_once( __DIR__ . '/Maintenance.php' );
  
 +/**
 + * Maintenance script that re-assigns users from an old group to a new one.
 + *
 + * @ingroup Maintenance
 + */
  class MigrateUserGroup extends Maintenance {
  	public function __construct() {
  		parent::__construct();
@@@ -60,7 -54,15 +60,15 @@@
  			$dbw->update( 'user_groups',
  				array( 'ug_group' => $newGroup ),
  				array( 'ug_group' => $oldGroup,
- 					"ug_user BETWEEN $blockStart AND $blockEnd" )
+ 					"ug_user BETWEEN $blockStart AND $blockEnd" ),
+ 				__METHOD__,
+ 				array( 'IGNORE' )
+ 			);
+ 			$count += $dbw->affectedRows();
+ 			$dbw->delete( 'user_groups',
+ 				array( 'ug_group' => $oldGroup,
+ 					"ug_user BETWEEN $blockStart AND $blockEnd" ),
+ 				__METHOD__
  			);
  			$count += $dbw->affectedRows();
  			$dbw->commit( __METHOD__ );