Got rid of remaining usages of immediateBegin()/immediateCommit(), marked these funct...

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 5461398..444c558 100644 (file)
--- 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 aab5f03..f1b54fa 100644 (file)
--- 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 578f12f..226803f 100644 (file)
--- 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;