summaryrefslogtreecommitdiff
path: root/maintenance/populateParentId.inc
diff options
context:
space:
mode:
Diffstat (limited to 'maintenance/populateParentId.inc')
-rw-r--r--maintenance/populateParentId.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/maintenance/populateParentId.inc b/maintenance/populateParentId.inc
index 3fecc63b..7b1ae3e8 100644
--- a/maintenance/populateParentId.inc
+++ b/maintenance/populateParentId.inc
@@ -3,11 +3,11 @@
define( 'BATCH_SIZE', 200 );
function populate_rev_parent_id( $db ) {
- echo "Populating rev_parent_id column\n";
+ wfOut( "Populating rev_parent_id column\n" );
$start = $db->selectField( 'revision', 'MIN(rev_id)', false, __FUNCTION__ );
$end = $db->selectField( 'revision', 'MAX(rev_id)', false, __FUNCTION__ );
if( is_null( $start ) || is_null( $end ) ){
- echo "...revision table seems to be empty.\n";
+ wfOut( "...revision table seems to be empty.\n" );
$db->insert( 'updatelog',
array( 'ul_key' => 'populate rev_parent_id' ),
__FUNCTION__,
@@ -16,12 +16,12 @@ function populate_rev_parent_id( $db ) {
}
# Do remaining chunk
$end += BATCH_SIZE - 1;
- $blockStart = $start;
- $blockEnd = $start + BATCH_SIZE - 1;
+ $blockStart = intval( $start );
+ $blockEnd = intval( $start ) + BATCH_SIZE - 1;
$count = 0;
$changed = 0;
while( $blockEnd <= $end ) {
- echo "...doing rev_id from $blockStart to $blockEnd\n";
+ wfOut( "...doing rev_id from $blockStart to $blockEnd\n" );
$cond = "rev_id BETWEEN $blockStart AND $blockEnd";
$res = $db->select( 'revision',
array('rev_id','rev_page','rev_timestamp','rev_parent_id'),
@@ -36,14 +36,14 @@ function populate_rev_parent_id( $db ) {
# as timestamp can only decrease and never loops with IDs (from parent to parent)
$previousID = $db->selectField( 'revision', 'rev_id',
array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $row->rev_timestamp,
- "rev_id < {$row->rev_id}" ),
+ "rev_id < " . intval( $row->rev_id ) ),
__FUNCTION__,
array( 'ORDER BY' => 'rev_id DESC' ) );
# If there are none, check the the highest ID with a lower timestamp
if( !$previousID ) {
# Get the highest older timestamp
$lastTimestamp = $db->selectField( 'revision', 'rev_timestamp',
- array( 'rev_page' => $row->rev_page, "rev_timestamp < '{$row->rev_timestamp}'" ),
+ array( 'rev_page' => $row->rev_page, "rev_timestamp < " . $db->addQuotes( $row->rev_timestamp ) ),
__FUNCTION__,
array( 'ORDER BY' => 'rev_timestamp DESC' ) );
# If there is one, let the highest rev ID win
@@ -73,10 +73,10 @@ function populate_rev_parent_id( $db ) {
__FUNCTION__,
'IGNORE' );
if( $logged ) {
- echo "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n";
+ wfOut( "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n" );
return true;
} else {
- echo "Could not insert rev_parent_id population row.\n";
+ wfOut( "Could not insert rev_parent_id population row.\n" );
return false;
}
}