X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmigrateUserGroup.php;h=703d97f9b5ae594d21953e3ac103fdbc3845993e;hb=129556f6fe3189ce2b515089757bdb9da80cb43c;hp=ad82542fb56fba8b306e5a232a89d8a30c8cc1cd;hpb=d9e7700b042121c7b159b475ff52d81a4fe8d77c;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php index ad82542fb5..703d97f9b5 100644 --- a/maintenance/migrateUserGroup.php +++ b/maintenance/migrateUserGroup.php @@ -48,7 +48,7 @@ class MigrateUserGroup extends Maintenance { $end = $dbw->selectField( 'user_groups', 'MAX(ug_user)', [ 'ug_group' => $oldGroup ], __FUNCTION__ ); if ( $start === null ) { - $this->error( "Nothing to do - no users in the '$oldGroup' group", true ); + $this->fatalError( "Nothing to do - no users in the '$oldGroup' group" ); } # Do remaining chunk $end += $batchSize - 1; @@ -63,7 +63,7 @@ class MigrateUserGroup extends Maintenance { $dbw->update( 'user_groups', [ 'ug_group' => $newGroup ], [ 'ug_group' => $oldGroup, - "ug_user BETWEEN $blockStart AND $blockEnd" ], + "ug_user BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ], __METHOD__, [ 'IGNORE' ] ); @@ -74,7 +74,7 @@ class MigrateUserGroup extends Maintenance { // user/group is UNIQUE. $dbw->delete( 'user_groups', [ 'ug_group' => $oldGroup, - "ug_user BETWEEN $blockStart AND $blockEnd" ], + "ug_user BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ], __METHOD__ ); $affected += $dbw->affectedRows(); @@ -86,7 +86,7 @@ class MigrateUserGroup extends Maintenance { // 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" ], + "ug_user BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ], __METHOD__ ); if ( $res !== false ) {