From 9b4d71f531ce5492cbf6a2f866c4be46e54c9fb1 Mon Sep 17 00:00:00 2001 From: Phantom42 Date: Fri, 8 Dec 2017 21:35:38 +0200 Subject: [PATCH] Cast block start to int in maintenace SQL Bug: T182209 Change-Id: Ic2dbbacdf0a77b8ac531cff8e11be0da8014e083 --- maintenance/cleanupBlocks.php | 8 ++++---- maintenance/migrateUserGroup.php | 6 +++--- maintenance/orphans.php | 4 ++-- maintenance/populateBacklinkNamespace.php | 2 +- maintenance/populateIpChanges.php | 2 +- maintenance/populateLogSearch.php | 2 +- maintenance/populateLogUsertext.php | 3 ++- maintenance/populateRecentChangesSource.php | 2 +- maintenance/populateRevisionSha1.php | 4 ++-- maintenance/rebuildFileCache.php | 2 +- maintenance/recountCategories.php | 2 +- maintenance/updateRestrictions.php | 3 ++- 12 files changed, 21 insertions(+), 19 deletions(-) diff --git a/maintenance/cleanupBlocks.php b/maintenance/cleanupBlocks.php index 5c5c88f0b0..41d492d4d8 100644 --- a/maintenance/cleanupBlocks.php +++ b/maintenance/cleanupBlocks.php @@ -55,8 +55,8 @@ class CleanupBlocks extends Maintenance { 'ipblocks', [ 'ipb_user' ], [ - "ipb_user >= $from", - "ipb_user <= $to", + "ipb_user >= " . (int)$from, + "ipb_user <= " . (int)$to, ], __METHOD__, [ @@ -128,8 +128,8 @@ class CleanupBlocks extends Maintenance { [ 'ipb_id', 'user_name' ], [ 'ipb_user = user_id', - "ipb_user >= $from", - "ipb_user <= $to", + "ipb_user >= " . (int)$from, + "ipb_user <= " . (int)$to, 'ipb_address != user_name', ], __METHOD__ diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php index 81c2353b14..703d97f9b5 100644 --- a/maintenance/migrateUserGroup.php +++ b/maintenance/migrateUserGroup.php @@ -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 ) { diff --git a/maintenance/orphans.php b/maintenance/orphans.php index 644fb958df..54a68aeb36 100644 --- a/maintenance/orphans.php +++ b/maintenance/orphans.php @@ -202,8 +202,8 @@ class Orphans extends Maintenance { $result2 = $dbw->query( " SELECT MAX(rev_timestamp) as max_timestamp FROM $revision - WHERE rev_page=$row->page_id - " ); + WHERE rev_page=" . (int)( $row->page_id ) + ); $row2 = $dbw->fetchObject( $result2 ); if ( $row2 ) { if ( $row->rev_timestamp != $row2->max_timestamp ) { diff --git a/maintenance/populateBacklinkNamespace.php b/maintenance/populateBacklinkNamespace.php index eb8280613f..f5f1de69d3 100644 --- a/maintenance/populateBacklinkNamespace.php +++ b/maintenance/populateBacklinkNamespace.php @@ -67,7 +67,7 @@ class PopulateBacklinkNamespace extends LoggedUpdateMaintenance { $blockEnd = $start + $batchSize - 1; while ( $blockEnd <= $end ) { $this->output( "...doing page_id from $blockStart to $blockEnd\n" ); - $cond = "page_id BETWEEN $blockStart AND $blockEnd"; + $cond = "page_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd; $res = $db->select( 'page', [ 'page_id', 'page_namespace' ], $cond, __METHOD__ ); foreach ( $res as $row ) { $db->update( 'pagelinks', diff --git a/maintenance/populateIpChanges.php b/maintenance/populateIpChanges.php index 4becf6dd4d..216582086c 100644 --- a/maintenance/populateIpChanges.php +++ b/maintenance/populateIpChanges.php @@ -87,7 +87,7 @@ TEXT $rows = $dbr->select( 'revision', [ 'rev_id', 'rev_timestamp', 'rev_user_text' ], - [ "rev_id BETWEEN $blockStart AND $blockEnd", 'rev_user' => 0 ], + [ "rev_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd, 'rev_user' => 0 ], __METHOD__ ); diff --git a/maintenance/populateLogSearch.php b/maintenance/populateLogSearch.php index 113cc63950..979a28a20e 100644 --- a/maintenance/populateLogSearch.php +++ b/maintenance/populateLogSearch.php @@ -76,7 +76,7 @@ class PopulateLogSearch extends LoggedUpdateMaintenance { $delTypes = [ 'delete', 'suppress' ]; // revisiondelete types while ( $blockEnd <= $end ) { $this->output( "...doing log_id from $blockStart to $blockEnd\n" ); - $cond = "log_id BETWEEN $blockStart AND $blockEnd"; + $cond = "log_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd; $res = $db->select( 'logging', [ 'log_id', 'log_type', 'log_action', 'log_params' ], $cond, __FUNCTION__ ); diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php index c5c079ac0a..6e8261a612 100644 --- a/maintenance/populateLogUsertext.php +++ b/maintenance/populateLogUsertext.php @@ -64,7 +64,8 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance { $blockEnd = $start + $batchSize - 1; while ( $blockEnd <= $end ) { $this->output( "...doing log_id from $blockStart to $blockEnd\n" ); - $cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id"; + $cond = "log_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd . + " AND log_user = user_id"; $res = $db->select( [ 'logging', 'user' ], [ 'log_id', 'user_name' ], $cond, __METHOD__ ); diff --git a/maintenance/populateRecentChangesSource.php b/maintenance/populateRecentChangesSource.php index 04ad255cc3..0a53dd614b 100644 --- a/maintenance/populateRecentChangesSource.php +++ b/maintenance/populateRecentChangesSource.php @@ -65,7 +65,7 @@ class PopulateRecentChangesSource extends LoggedUpdateMaintenance { [ $updatedValues ], [ "rc_source = ''", - "rc_id BETWEEN $blockStart AND $blockEnd" + "rc_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ], __METHOD__ ); diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php index f3506ec70f..7ced779bfd 100644 --- a/maintenance/populateRevisionSha1.php +++ b/maintenance/populateRevisionSha1.php @@ -93,8 +93,8 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance { $blockEnd = $start + $batchSize - 1; while ( $blockEnd <= $end ) { $this->output( "...doing $idCol from $blockStart to $blockEnd\n" ); - $cond = "$idCol BETWEEN $blockStart AND $blockEnd - AND $idCol IS NOT NULL AND {$prefix}_sha1 = ''"; + $cond = "$idCol BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd . + " AND $idCol IS NOT NULL AND {$prefix}_sha1 = ''"; $res = $db->select( $queryInfo['tables'], $queryInfo['fields'], $cond, __METHOD__, [], $queryInfo['joins'] ); diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index 0b5b9b04e3..1fc1daf5a4 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -104,7 +104,7 @@ class RebuildFileCache extends Maintenance { $res = $dbr->select( 'page', [ 'page_namespace', 'page_title', 'page_id' ], [ 'page_namespace' => MWNamespace::getContentNamespaces(), - "page_id BETWEEN $blockStart AND $blockEnd" ], + "page_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ], __METHOD__, [ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ] ); diff --git a/maintenance/recountCategories.php b/maintenance/recountCategories.php index ed6a357b36..6a00d570e8 100644 --- a/maintenance/recountCategories.php +++ b/maintenance/recountCategories.php @@ -156,7 +156,7 @@ TEXT [ "cat_{$this->mode}" => $row->count ], [ 'cat_id' => $row->cat_id, - "cat_{$this->mode} != {$row->count}", + "cat_{$this->mode} != " . (int)( $row->count ), ], __METHOD__ ); $affectedRows += $dbw->affectedRows(); diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php index c0b7b10f9b..c4dccbc65f 100644 --- a/maintenance/updateRestrictions.php +++ b/maintenance/updateRestrictions.php @@ -59,7 +59,8 @@ class UpdateRestrictions extends Maintenance { $encodedExpiry = 'infinity'; while ( $blockEnd <= $end ) { $this->output( "...doing page_id from $blockStart to $blockEnd out of $end\n" ); - $cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''"; + $cond = "page_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd . + " AND page_restrictions !=''"; $res = $db->select( 'page', [ 'page_id', 'page_namespace', 'page_restrictions' ], -- 2.20.1