From 775adbf3290af7082d8a2067c2f77250dbdd1eff Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Mon, 5 Jul 2010 19:47:46 +0000 Subject: [PATCH] Got rid of remaining usages of immediateBegin()/immediateCommit(), marked these functions with wfDeprecated() --- includes/db/Database.php | 2 ++ includes/db/DatabaseOracle.php | 4 ---- includes/db/DatabasePostgres.php | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 54613983de..444c558cbe 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -2002,6 +2002,7 @@ abstract class DatabaseBase { * @deprecated use begin() */ function immediateBegin( $fname = 'Database::immediateBegin' ) { + wfDeprecated( __METHOD__ ); $this->begin(); } @@ -2010,6 +2011,7 @@ abstract class DatabaseBase { * @deprecated use commit() */ function immediateCommit( $fname = 'Database::immediateCommit' ) { + wfDeprecated( __METHOD__ ); $this->commit(); } diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index aab5f0331d..f1b54fafc5 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -909,10 +909,6 @@ class DatabaseOracle extends DatabaseBase { $this->mTrxLevel = 1; } - function immediateCommit( $fname = '' ) { - return true; - } - function commit( $fname = '' ) { oci_commit( $this->mConn ); $this->mTrxLevel = 0; diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 578f12f996..226803fb57 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -1284,9 +1284,7 @@ SQL; $this->query( 'BEGIN', $fname ); $this->mTrxLevel = 1; } - function immediateCommit( $fname = 'DatabasePostgres::immediateCommit' ) { - return true; - } + function commit( $fname = 'DatabasePostgres::commit' ) { $this->query( 'COMMIT', $fname ); $this->mTrxLevel = 0; -- 2.20.1