X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=includes%2Fdb%2FDatabaseOracle.php;h=a123d00f27d201b3a482a6ab2f032db70914873c;hb=a830c14d0b5c572709817ae7155a0d0ae5939436;hp=5df7aef6203387c7bdc679e68d14dc2137f67665;hpb=7bfec54fa5b74f93699509c1f1663806c3dac497;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 5df7aef620..a123d00f27 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -21,6 +21,7 @@
  * @ingroup Database
  */
 
+use Wikimedia\AtEase\AtEase;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
@@ -68,10 +69,10 @@ class DatabaseOracle extends Database {
 	}
 
 	function __destruct() {
-		if ( $this->opened ) {
-			Wikimedia\suppressWarnings();
+		if ( $this->conn ) {
+			AtEase::suppressWarnings();
 			$this->close();
-			Wikimedia\restoreWarnings();
+			AtEase::restoreWarnings();
 		}
 	}
 
@@ -159,8 +160,6 @@ class DatabaseOracle extends Database {
 			throw new DBConnectionError( $this, $this->lastError() );
 		}
 
-		$this->opened = true;
-
 		# removed putenv calls because they interfere with the system globaly
 		$this->doQuery( 'ALTER SESSION SET NLS_TIMESTAMP_FORMAT=\'DD-MM-YYYY HH24:MI:SS.FF6\'' );
 		$this->doQuery( 'ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT=\'DD-MM-YYYY HH24:MI:SS.FF6\'' );
@@ -179,7 +178,7 @@ class DatabaseOracle extends Database {
 	}
 
 	function execFlags() {
-		return $this->trxLevel ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
+		return $this->trxLevel() ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
 	}
 
 	/**
@@ -254,11 +253,7 @@ class DatabaseOracle extends Database {
 	 * @param IResultWrapper|ORAResult $res
 	 */
 	function freeResult( $res ) {
-		if ( $res instanceof ResultWrapper ) {
-			$res = $res->result;
-		}
-
-		$res->free();
+		ResultWrapper::unwrap( $res )->free();
 	}
 
 	/**
@@ -266,11 +261,7 @@ class DatabaseOracle extends Database {
 	 * @return stdClass|bool
 	 */
 	function fetchObject( $res ) {
-		if ( $res instanceof ResultWrapper ) {
-			$res = $res->result;
-		}
-
-		return $res->fetchObject();
+		return ResultWrapper::unwrap( $res )->fetchObject();
 	}
 
 	/**
@@ -278,11 +269,7 @@ class DatabaseOracle extends Database {
 	 * @return stdClass|bool
 	 */
 	function fetchRow( $res ) {
-		if ( $res instanceof ResultWrapper ) {
-			$res = $res->result;
-		}
-
-		return $res->fetchRow();
+		return ResultWrapper::unwrap( $res )->fetchRow();
 	}
 
 	/**
@@ -290,11 +277,7 @@ class DatabaseOracle extends Database {
 	 * @return int
 	 */
 	function numRows( $res ) {
-		if ( $res instanceof ResultWrapper ) {
-			$res = $res->result;
-		}
-
-		return $res->numRows();
+		return ResultWrapper::unwrap( $res )->numRows();
 	}
 
 	/**
@@ -302,11 +285,7 @@ class DatabaseOracle extends Database {
 	 * @return int
 	 */
 	function numFields( $res ) {
-		if ( $res instanceof ResultWrapper ) {
-			$res = $res->result;
-		}
-
-		return $res->numFields();
+		return ResultWrapper::unwrap( $res )->numFields();
 	}
 
 	function fieldName( $stmt, $n ) {
@@ -327,7 +306,7 @@ class DatabaseOracle extends Database {
 		if ( $res instanceof ORAResult ) {
 			$res->seek( $row );
 		} else {
-			$res->result->seek( $row );
+			ResultWrapper::unwrap( $res )->seek( $row );
 		}
 	}
 
@@ -549,7 +528,7 @@ class DatabaseOracle extends Database {
 			}
 		}
 
-		if ( !$this->trxLevel ) {
+		if ( !$this->trxLevel() ) {
 			oci_commit( $this->conn );
 		}
 
@@ -943,26 +922,24 @@ class DatabaseOracle extends Database {
 	}
 
 	protected function doBegin( $fname = __METHOD__ ) {
-		$this->trxLevel = 1;
-		$this->doQuery( 'SET CONSTRAINTS ALL DEFERRED' );
+		$this->query( 'SET CONSTRAINTS ALL DEFERRED' );
 	}
 
 	protected function doCommit( $fname = __METHOD__ ) {
-		if ( $this->trxLevel ) {
+		if ( $this->trxLevel() ) {
 			$ret = oci_commit( $this->conn );
 			if ( !$ret ) {
 				throw new DBUnexpectedError( $this, $this->lastError() );
 			}
-			$this->trxLevel = 0;
-			$this->doQuery( 'SET CONSTRAINTS ALL IMMEDIATE' );
+			$this->query( 'SET CONSTRAINTS ALL IMMEDIATE' );
 		}
 	}
 
 	protected function doRollback( $fname = __METHOD__ ) {
-		if ( $this->trxLevel ) {
+		if ( $this->trxLevel() ) {
 			oci_rollback( $this->conn );
-			$this->trxLevel = 0;
-			$this->doQuery( 'SET CONSTRAINTS ALL IMMEDIATE' );
+			$ignoreErrors = true;
+			$this->query( 'SET CONSTRAINTS ALL IMMEDIATE', $fname, $ignoreErrors );
 		}
 	}
 
@@ -1339,7 +1316,7 @@ class DatabaseOracle extends Database {
 			}
 		}
 
-		if ( !$this->trxLevel ) {
+		if ( !$this->trxLevel() ) {
 			oci_commit( $this->conn );
 		}