From: Chad Horohoe Date: Mon, 14 Dec 2009 23:18:03 +0000 (+0000) Subject: Followup r60051, with the rest of the callers and removing a useless subclassing... X-Git-Tag: 1.31.0-rc.0~38535 X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=291efd30f2173070df8c1939f659759521f8fae6;p=lhc%2Fweb%2Fwiklou.git Followup r60051, with the rest of the callers and removing a useless subclassing from DatabaseMssql --- diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 902eb77160..e81c8ad646 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -842,22 +842,6 @@ class DatabaseMssql extends DatabaseBase { return $this->lastErrno() == 1205; } - /** - * Begin a transaction, committing any previously open transaction - * @deprecated use begin() - */ - function immediateBegin( $fname = 'Database::immediateBegin' ) { - $this->begin(); - } - - /** - * Commit transaction, if one is open - * @deprecated use commit() - */ - function immediateCommit( $fname = 'Database::immediateCommit' ) { - $this->commit(); - } - /** * Return MW-style timestamp used for MySQL schema */ diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php index 29853f130f..37140c6e87 100644 --- a/maintenance/addwiki.php +++ b/maintenance/addwiki.php @@ -118,7 +118,7 @@ class AddWiki extends Maintenance { $blobsFile = popen( $sedCmd, 'r' ); $extdb->sourceStream( $blobsFile ); pclose( $blobsFile ); - $extdb->immediateCommit(); + $extdb->commit(); } } diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php index d1927f9006..e78ffe4160 100644 --- a/maintenance/cleanupSpam.php +++ b/maintenance/cleanupSpam.php @@ -109,7 +109,7 @@ class CleanupSpam extends Maintenance { $this->output( "False match\n" ); } else { $dbw = wfGetDB( DB_MASTER ); - $dbw->immediateBegin(); + $dbw->begin(); if ( !$rev ) { // Didn't find a non-spammy revision, blank the page $this->output( "blanking\n" ); @@ -123,7 +123,7 @@ class CleanupSpam extends Maintenance { $article = new Article( $title ); $article->updateArticle( $rev->getText(), wfMsg( 'spam_reverting', $domain ), false, false ); } - $dbw->immediateCommit(); + $dbw->commit(); wfDoUpdates(); } } diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php index 6946b0c3d0..56afd86c45 100644 --- a/maintenance/deleteBatch.php +++ b/maintenance/deleteBatch.php @@ -93,7 +93,7 @@ class DeleteBatch extends Maintenance { $art = new Article( $page ); } $success = $art->doDeleteArticle( $reason ); - $dbw->immediateCommit(); + $dbw->commit(); if ( $success ) { $this->output( "\n" ); } else { diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php index 45e42a2904..1146befba8 100644 --- a/maintenance/deleteOrphanedRevisions.php +++ b/maintenance/deleteOrphanedRevisions.php @@ -39,7 +39,7 @@ class DeleteOrphanedRevisions extends Maintenance { $report = $this->hasOption('report'); $dbw = wfGetDB( DB_MASTER ); - $dbw->immediateBegin(); + $dbw->begin(); list( $page, $revision ) = $dbw->tableNamesN( 'page', 'revision' ); # Find all the orphaned revisions @@ -57,7 +57,7 @@ class DeleteOrphanedRevisions extends Maintenance { # Nothing to do? if( $report || $count == 0 ) { - $dbw->immediateCommit(); + $dbw->commit(); exit(0); } @@ -67,7 +67,7 @@ class DeleteOrphanedRevisions extends Maintenance { $this->output( "done.\n" ); # Close the transaction and call the script to purge unused text records - $dbw->immediateCommit(); + $dbw->commit(); $this->purgeRedundantText( true ); } diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php index 9f236773e7..bd4ef7b112 100644 --- a/maintenance/moveBatch.php +++ b/maintenance/moveBatch.php @@ -94,7 +94,7 @@ class MoveBatch extends Maintenance { if( $err !== true ) { $this->output( "\nFAILED: $err" ); } - $dbw->immediateCommit(); + $dbw->commit(); $this->output( "\n" ); if ( $interval ) { diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 296e7e10bc..e595e5b35f 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -67,7 +67,7 @@ class ReassignEdits extends Maintenance { */ private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) { $dbw = wfGetDB( DB_MASTER ); - $dbw->immediateBegin(); + $dbw->begin(); # Count things $this->output( "Checking current edits..." ); @@ -113,7 +113,7 @@ class ReassignEdits extends Maintenance { } } - $dbw->immediateCommit(); + $dbw->commit(); return (int)$total; } diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index c75554e25d..6dccefb335 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -203,7 +203,7 @@ class RefreshLinks extends Maintenance { $parserOutput = $wgParser->parse( $revision->getText(), $wgTitle, $options, true, true, $revision->getId() ); $update = new LinksUpdate( $wgTitle, $parserOutput, false ); $update->doUpdate(); - $dbw->immediateCommit(); + $dbw->commit(); } /* diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php index a417eba6dd..7b0535b73f 100644 --- a/maintenance/removeUnusedAccounts.php +++ b/maintenance/removeUnusedAccounts.php @@ -95,12 +95,12 @@ class RemoveUnusedAccounts extends Maintenance { 'image' => 'img', 'oldimage' => 'oi' ); $count = 0; - $dbo->immediateBegin(); + $dbo->begin(); foreach( $checks as $table => $fprefix ) { $conds = array( $fprefix . '_user' => $id ); $count += (int)$dbo->selectField( $table, 'COUNT(*)', $conds, __METHOD__ ); } - $dbo->immediateCommit(); + $dbo->commit(); return $count == 0; } diff --git a/maintenance/renamewiki.php b/maintenance/renamewiki.php index c12a25f6cf..5751aea801 100644 --- a/maintenance/renamewiki.php +++ b/maintenance/renamewiki.php @@ -78,7 +78,7 @@ class RenameWiki extends Maintenance { $extdb->query( "ALTER TABLE {$from}.blobs RENAME TO {$to}.blobs" ); $extdb->selectDB( $from ); $extdb->sourceFile( $this->getDir() . '/storage/blobs.sql' ); - $extdb->immediateCommit(); + $extdb->commit(); } } $this->output( "done.\n" ); diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php index 8e5e45d13b..aaad3714d9 100644 --- a/maintenance/updateSpecialPages.php +++ b/maintenance/updateSpecialPages.php @@ -122,7 +122,7 @@ class UpdateSpecialPages extends Maintenance { $this->output( "Reconnected\n\n" ); } else { # Commit the results - $dbw->immediateCommit(); + $dbw->commit(); } # Wait for the slave to catch up wfWaitForSlaves( 5 );