X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdb%2FDatabaseOracle.php;h=63e68f04f54aecb711d6f88c1c866f112dd7a61b;hb=86df2d275521184e42f30254724da2b0483ad421;hp=69d406c2fab303467db899f79aa6f7c915e9ae56;hpb=3742d1058dfc93fc8b4099ebcbc94a4926af7551;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 69d406c2fa..63e68f04f5 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @ingroup Database
+ * This is the Oracle database abstraction layer.
+ *
  * @file
+ * @ingroup Database
  */
 
 /**
- * This is the Oracle database abstraction layer.
  * @ingroup Database
  */
 class ORABlob {
 	var $mData;
 
-	function __construct($data) {
+	function __construct( $data ) {
 		$this->mData = $data;
 	}
 
@@ -29,35 +30,56 @@ class ORABlob {
 class ORAResult {
 	private $rows;
 	private $cursor;
-	private $stmt;
 	private $nrows;
+	
+	private $columns = array();
 
-	private $unique;
+	private function array_unique_md( $array_in ) {
+		$array_out = array();
+		$array_hashes = array();
+
+		foreach ( $array_in as $item ) {
+			$hash = md5( serialize( $item ) );
+			if ( !isset( $array_hashes[$hash] ) ) {
+				$array_hashes[$hash] = $hash;
+				$array_out[] = $item;
+			}
+		}
+
+		return $array_out;
+	}
 
-	function __construct(&$db, $stmt, $unique = false) {
+	function __construct( &$db, $stmt, $unique = false ) {
 		$this->db =& $db;
 
-		if (($this->nrows = oci_fetch_all($stmt, $this->rows, 0, -1, OCI_FETCHSTATEMENT_BY_ROW | OCI_NUM)) === false) {
-			$e = oci_error($stmt);
-			$db->reportQueryError($e['message'], $e['code'], '', __FUNCTION__);
+		if ( ( $this->nrows = oci_fetch_all( $stmt, $this->rows, 0, - 1, OCI_FETCHSTATEMENT_BY_ROW | OCI_NUM ) ) === false ) {
+			$e = oci_error( $stmt );
+			$db->reportQueryError( $e['message'], $e['code'], '', __METHOD__ );
+			$this->free();
 			return;
 		}
 
-		if ($unique) {
-			$this->rows = array_unique($this->rows);
-			$this->nrows = count($this->rows);
+		if ( $unique ) {
+			$this->rows = $this->array_unique_md( $this->rows );
+			$this->nrows = count( $this->rows );
+		}
+
+		if ($this->nrows > 0) {
+			foreach ( $this->rows[0] as $k => $v ) {
+				$this->columns[$k] = strtolower( oci_field_name( $stmt, $k + 1 ) );
+			}
 		}
 
 		$this->cursor = 0;
-		$this->stmt = $stmt;
+		oci_free_statement( $stmt );
 	}
 
 	public function free() {
-		oci_free_statement($this->stmt);
+		unset($this->db);
 	}
 
-	public function seek($row) {
-		$this->cursor = min($row, $this->nrows);
+	public function seek( $row ) {
+		$this->cursor = min( $row, $this->nrows );
 	}
 
 	public function numRows() {
@@ -65,16 +87,17 @@ class ORAResult {
 	}
 
 	public function numFields() {
-		return oci_num_fields($this->stmt);
+		return count($this->columns);
 	}
 
 	public function fetchObject() {
-		if ($this->cursor >= $this->nrows)
+		if ( $this->cursor >= $this->nrows ) {
 			return false;
+		}
 		$row = $this->rows[$this->cursor++];
 		$ret = new stdClass();
-		foreach ($row as $k => $v) {
-			$lc = strtolower(oci_field_name($this->stmt, $k + 1));
+		foreach ( $row as $k => $v ) {
+			$lc = $this->columns[$k];
 			$ret->$lc = $v;
 		}
 
@@ -82,13 +105,14 @@ class ORAResult {
 	}
 
 	public function fetchRow() {
-		if ($this->cursor >= $this->nrows)
+		if ( $this->cursor >= $this->nrows ) {
 			return false;
+		}
 
 		$row = $this->rows[$this->cursor++];
 		$ret = array();
-		foreach ($row as $k => $v) {
-			$lc = strtolower(oci_field_name($this->stmt, $k + 1));
+		foreach ( $row as $k => $v ) {
+			$lc = $this->columns[$k];
 			$ret[$lc] = $v;
 			$ret[$k] = $v;
 		}
@@ -100,23 +124,23 @@ class ORAResult {
  * Utility class.
  * @ingroup Database
  */
-class ORAField {
+class ORAField implements Field {
 	private $name, $tablename, $default, $max_length, $nullable,
 		$is_pk, $is_unique, $is_multiple, $is_key, $type;
 
-	function __construct($info) {
+	function __construct( $info ) {
 		$this->name = $info['column_name'];
 		$this->tablename = $info['table_name'];
 		$this->default = $info['data_default'];
 		$this->max_length = $info['data_length'];
 		$this->nullable = $info['not_null'];
-		$this->is_pk = isset($info['prim']) && $info['prim'] == 1 ? 1 : 0;
-		$this->is_unique = isset($info['uniq']) && $info['uniq'] == 1 ? 1 : 0;
-		$this->is_multiple = isset($info['nonuniq']) && $info['nonuniq'] == 1 ? 1 : 0;
-		$this->is_key = ($this->is_pk || $this->is_unique || $this->is_multiple);
+		$this->is_pk = isset( $info['prim'] ) && $info['prim'] == 1 ? 1 : 0;
+		$this->is_unique = isset( $info['uniq'] ) && $info['uniq'] == 1 ? 1 : 0;
+		$this->is_multiple = isset( $info['nonuniq'] ) && $info['nonuniq'] == 1 ? 1 : 0;
+		$this->is_key = ( $this->is_pk || $this->is_unique || $this->is_multiple );
 		$this->type = $info['data_type'];
 	}
- 
+
 	function name() {
 		return $this->name;
 	}
@@ -133,10 +157,10 @@ class ORAField {
 		return $this->max_length;
 	}
 
-	function nullable() {
+	function isNullable() {
 		return $this->nullable;
 	}
-	
+
 	function isKey() {
 		return $this->is_key;
 	}
@@ -154,21 +178,30 @@ class ORAField {
  * @ingroup Database
  */
 class DatabaseOracle extends DatabaseBase {
-	var $mInsertId = NULL;
-	var $mLastResult = NULL;
-	var $numeric_version = NULL;
+	var $mInsertId = null;
+	var $mLastResult = null;
+	var $numeric_version = null;
 	var $lastResult = null;
 	var $cursor = 0;
 	var $mAffectedRows;
 
 	var $ignore_DUP_VAL_ON_INDEX = false;
+	var $sequenceData = null;
+
+	var $defaultCharset = 'AL32UTF8';
 
-	function DatabaseOracle($server = false, $user = false, $password = false, $dbName = false,
-		$failFunction = false, $flags = 0, $tablePrefix = 'get from global' )
+	var $mFieldInfoCache = array();
+
+	function __construct( $server = false, $user = false, $password = false, $dbName = false,
+		$flags = 0, $tablePrefix = 'get from global' )
 	{
-		$tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper($tablePrefix);
-		parent::__construct($server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix);
-		wfRunHooks( 'DatabaseOraclePostInit', array(&$this));
+		$tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper( $tablePrefix );
+		parent::__construct( $server, $user, $password, $dbName, $flags, $tablePrefix );
+		wfRunHooks( 'DatabaseOraclePostInit', array( &$this ) );
+	}
+
+	function getType() {
+		return 'oracle';
 	}
 
 	function cascadingDeletes() {
@@ -193,53 +226,63 @@ class DatabaseOracle extends DatabaseBase {
 		return true;
 	}
 
-	static function newFromParams( $server = false, $user = false, $password = false, $dbName = false,
-		$failFunction = false, $flags = 0)
+	static function newFromParams( $server, $user, $password, $dbName, $flags = 0 )
 	{
-		return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags );
+		return new DatabaseOracle( $server, $user, $password, $dbName, $flags );
 	}
 
 	/**
 	 * Usually aborts on failure
-	 * If the failFunction is set to a non-zero integer, returns success
 	 */
 	function open( $server, $user, $password, $dbName ) {
 		if ( !function_exists( 'oci_connect' ) ) {
 			throw new DBConnectionError( $this, "Oracle functions missing, have you compiled PHP with the --with-oci8 option?\n (Note: if you recently installed PHP, you may need to restart your webserver and database)\n" );
 		}
-		
-		putenv("NLS_LANG=AMERICAN_AMERICA.AL32UTF8");
 
 		$this->close();
-		$this->mServer = $server;
 		$this->mUser = $user;
 		$this->mPassword = $password;
-		$this->mDBname = $dbName;
+		// changed internal variables functions
+		// mServer now holds the TNS endpoint
+		// mDBname is schema name if different from username
+		if ( !$server ) {
+			// backward compatibillity (server used to be null and TNS was supplied in dbname)
+			$this->mServer = $dbName;
+			$this->mDBname = $user;
+		} else {
+			$this->mServer = $server;
+			if ( !$dbName ) {
+				$this->mDBname = $user;
+			} else {	
+				$this->mDBname = $dbName;
+			}
+		}
 
-		if (!strlen($user)) { ## e.g. the class is being loaded
-		return;
+		if ( !strlen( $user ) ) { # e.g. the class is being loaded
+			return;
 		}
 
-		//error_reporting( E_ALL ); //whoever had this bright idea
 		$session_mode = $this->mFlags & DBO_SYSDBA ? OCI_SYSDBA : OCI_DEFAULT;
-		if ( $this->mFlags & DBO_DEFAULT )
-			$this->mConn = oci_new_connect($user, $password, $dbName, null, $session_mode);
-		else
-			$this->mConn = oci_connect($user, $password, $dbName, null, $session_mode);
-
-		if ($this->mConn == false) {
-			wfDebug("DB connection error\n");
-			wfDebug("Server: $server, Database: $dbName, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n");
-			wfDebug($this->lastError()."\n");
-			return false;
+		if ( $this->mFlags & DBO_DEFAULT ) {
+			$this->mConn = oci_new_connect( $this->mUser, $this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
+		} else {
+			$this->mConn = oci_connect( $this->mUser, $this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
+		}
+
+		if ( $this->mUser != $this->mDBname ) {
+			//change current schema in session
+			$this->selectDB( $this->mDBname );
+		}
+
+		if ( !$this->mConn ) {
+			throw new DBConnectionError( $this, $this->lastError() );
 		}
 
 		$this->mOpened = 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\'');
-		
+
+		# 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\'' );
 		return $this->mConn;
 	}
 
@@ -260,93 +303,100 @@ class DatabaseOracle extends DatabaseBase {
 		return $this->mTrxLevel ? OCI_DEFAULT : OCI_COMMIT_ON_SUCCESS;
 	}
 
-	function doQuery($sql) {
-		wfDebug("SQL: [$sql]\n");
-		if (!mb_check_encoding($sql)) {
-			throw new MWException("SQL encoding is invalid");
+	function doQuery( $sql ) {
+		wfDebug( "SQL: [$sql]\n" );
+		if ( !mb_check_encoding( $sql ) ) {
+			throw new MWException( "SQL encoding is invalid\n$sql" );
 		}
 
-		//handle some oracle specifics
-		//remove AS column/table/subquery namings
-		$sql = preg_replace('/ as /i', ' ', $sql);
+		// handle some oracle specifics
+		// remove AS column/table/subquery namings
+		if ( !defined( 'MEDIAWIKI_INSTALL' ) ) {
+			$sql = preg_replace( '/ as /i', ' ', $sql );
+		}
 		// Oracle has issues with UNION clause if the statement includes LOB fields
 		// So we do a UNION ALL and then filter the results array with array_unique
-		$union_unique = (preg_match('/\/\* UNION_UNIQUE \*\/ /', $sql) != 0);
-		//EXPLAIN syntax in Oracle is EXPLAIN PLAN FOR and it return nothing
-		//you have to select data from plan table after explain
-		$explain_id = date('dmYHis');
-		$sql = preg_replace('/^EXPLAIN /', 'EXPLAIN PLAN SET STATEMENT_ID = \''.$explain_id.'\' FOR', $sql, 1, $explain_count);
-			
-		
-		if (($this->mLastResult = $stmt = oci_parse($this->mConn, $sql)) === false) {
-			$e = oci_error($this->mConn);
-			$this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+		$union_unique = ( preg_match( '/\/\* UNION_UNIQUE \*\/ /', $sql ) != 0 );
+		// EXPLAIN syntax in Oracle is EXPLAIN PLAN FOR and it return nothing
+		// you have to select data from plan table after explain
+		$explain_id = date( 'dmYHis' );
+
+		$sql = preg_replace( '/^EXPLAIN /', 'EXPLAIN PLAN SET STATEMENT_ID = \'' . $explain_id . '\' FOR', $sql, 1, $explain_count );
+
+		wfSuppressWarnings();
+
+		if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
+			$e = oci_error( $this->mConn );
+			$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+			return false;
 		}
 
-		$olderr = error_reporting(E_ERROR);
-		if (oci_execute($stmt, $this->execFlags()) == false) {
-			$e = oci_error($stmt);
-			if (!$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1')
-				$this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+		if ( !oci_execute( $stmt, $this->execFlags() ) ) {
+			$e = oci_error( $stmt );
+			if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) {
+				$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+				return false;
+			}
 		}
-		error_reporting($olderr);
 
-		if ($explain_count > 0) {
-			return $this->doQuery('SELECT id, cardinality "ROWS" FROM plan_table WHERE statement_id = \''.$explain_id.'\'');
-		} elseif (oci_statement_type($stmt) == "SELECT") {
-			return new ORAResult($this, $stmt, $union_unique);
+		wfRestoreWarnings();
+
+		if ( $explain_count > 0 ) {
+			return $this->doQuery( 'SELECT id, cardinality "ROWS" FROM plan_table WHERE statement_id = \'' . $explain_id . '\'' );
+		} elseif ( oci_statement_type( $stmt ) == 'SELECT' ) {
+			return new ORAResult( $this, $stmt, $union_unique );
 		} else {
-			$this->mAffectedRows = oci_num_rows($stmt);
+			$this->mAffectedRows = oci_num_rows( $stmt );
 			return true;
 		}
 	}
 
-	function queryIgnore($sql, $fname = '') {
-		return $this->query($sql, $fname, true);
+	function queryIgnore( $sql, $fname = '' ) {
+		return $this->query( $sql, $fname, true );
 	}
 
-	function freeResult($res) {
-		if ( $res instanceof ORAResult ) {
-			$res->free();
-		} else {
-			$res->result->free();
+	function freeResult( $res ) {
+		if ( $res instanceof ResultWrapper ) {
+			$res = $res->result;
 		}
+		
+		$res->free();
 	}
 
-	function fetchObject($res) {
-		if ( $res instanceof ORAResult ) {
-			return $res->numRows();
-		} else {
-			return $res->result->fetchObject();
+	function fetchObject( $res ) {
+		if ( $res instanceof ResultWrapper ) {
+			$res = $res->result;
 		}
+		
+		return $res->fetchObject();
 	}
 
-	function fetchRow($res) {
-		if ( $res instanceof ORAResult ) {
-			return $res->fetchRow();
-		} else {
-			return $res->result->fetchRow();
+	function fetchRow( $res ) {
+		if ( $res instanceof ResultWrapper ) {
+			$res = $res->result;
 		}
+
+		return $res->fetchRow();
 	}
 
-	function numRows($res) {
-		if ( $res instanceof ORAResult ) {
-			return $res->numRows();
-		} else {
-			return $res->result->numRows();
+	function numRows( $res ) {
+		if ( $res instanceof ResultWrapper ) {
+			$res = $res->result;
 		}
+
+		return $res->numRows();
 	}
 
-	function numFields($res) {
-		if ( $res instanceof ORAResult ) {
-			return $res->numFields();
-		} else {
-			return $res->result->numFields();
+	function numFields( $res ) {
+		if ( $res instanceof ResultWrapper ) {
+			$res = $res->result;
 		}
+
+		return $res->numFields();
 	}
 
-	function fieldName($stmt, $n) {
-		return oci_field_name($stmt, $n);
+	function fieldName( $stmt, $n ) {
+		return oci_field_name( $stmt, $n );
 	}
 
 	/**
@@ -356,27 +406,29 @@ class DatabaseOracle extends DatabaseBase {
 		return $this->mInsertId;
 	}
 
-	function dataSeek($res, $row) {
+	function dataSeek( $res, $row ) {
 		if ( $res instanceof ORAResult ) {
-			$res->seek($row);
+			$res->seek( $row );
 		} else {
-			$res->result->seek($row);
+			$res->result->seek( $row );
 		}
 	}
 
 	function lastError() {
-		if ($this->mConn === false)
+		if ( $this->mConn === false ) {
 			$e = oci_error();
-		else
-			$e = oci_error($this->mConn);
+		} else {
+			$e = oci_error( $this->mConn );
+		}
 		return $e['message'];
 	}
 
 	function lastErrno() {
-		if ($this->mConn === false)
+		if ( $this->mConn === false ) {
 			$e = oci_error();
-		else
-			$e = oci_error($this->mConn);
+		} else {
+			$e = oci_error( $this->mConn );
+		}
 		return $e['code'];
 	}
 
@@ -392,126 +444,191 @@ class DatabaseOracle extends DatabaseBase {
 		return false;
 	}
 
-	function indexUnique ($table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
+	function indexUnique( $table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
 		return false;
 	}
 
 	function insert( $table, $a, $fname = 'DatabaseOracle::insert', $options = array() ) {
-		if ( !count( $a ) )
+		if ( !count( $a ) ) {
 			return true;
+		}
 
-		if (!is_array($options))
-			$options = array($options);
+		if ( !is_array( $options ) ) {
+			$options = array( $options );
+		}
 
-    if (in_array('IGNORE', $options))
+		if ( in_array( 'IGNORE', $options ) ) {
 			$this->ignore_DUP_VAL_ON_INDEX = true;
+		}
 
-		if (!is_array(reset($a))) {
-			$a = array($a);
+		if ( !is_array( reset( $a ) ) ) {
+			$a = array( $a );
 		}
-		foreach ($a as $row) {
-			$this->insertOneRow($table, $row, $fname);
+
+		foreach ( $a as &$row ) {
+			$this->insertOneRow( $table, $row, $fname );
 		}
 		$retVal = true;
 
-		if (in_array('IGNORE', $options))
+		if ( in_array( 'IGNORE', $options ) ) {
 			$this->ignore_DUP_VAL_ON_INDEX = false;
+		}
 
 		return $retVal;
 	}
 
-	function insertOneRow($table, $row, $fname) {
-		global $wgLang;
+	private function fieldBindStatement ( $table, $col, &$val, $includeCol = false ) {
+		$col_info = $this->fieldInfoMulti( $table, $col );
+		$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+		
+		$bind = '';
+		if ( is_numeric( $col ) ) {
+			$bind = $val;
+			$val = null;
+			return $bind; 
+		} else if ( $includeCol ) {
+			$bind = "$col = ";
+		}
+		
+		if ( $val == '' && $val !== 0 && $col_type != 'BLOB' && $col_type != 'CLOB' ) {
+			$val = null;
+		}
 
+		if ( $val === null ) {
+			if ( $col_info != false && $col_info->nullable() == 0 && $col_info->defaultValue() != null ) {
+				$bind .= 'DEFAULT';
+			} else {
+				$bind .= 'NULL';
+			}
+		} else {
+			$bind .= ':' . $col;
+		}
+		
+		return $bind;
+	}
+
+	private function insertOneRow( $table, $row, $fname ) {
+		global $wgContLang;
+
+		$table = $this->tableName( $table );
 		// "INSERT INTO tables (a, b, c)"
-		$sql = "INSERT INTO " . $this->tableName($table) . " (" . join(',', array_keys($row)) . ')';
+		$sql = "INSERT INTO " . $table . " (" . join( ',', array_keys( $row ) ) . ')';
 		$sql .= " VALUES (";
 
 		// for each value, append ":key"
 		$first = true;
-		foreach ($row as $col => $val) {
-			if ($first)
-				$sql .= ':'.$col;
-			else
-				$sql.= ', :'.$col;
+		foreach ( $row as $col => &$val ) {
+			if ( !$first ) {
+				$sql .= ', ';
+			} else {
+				$first = false;
+			}
 			
-			$first = false;
+			$sql .= $this->fieldBindStatement( $table, $col, $val );
 		}
 		$sql .= ')';
 
-		$stmt = oci_parse($this->mConn, $sql);
-		foreach ($row as $col => $val) {
-			if (!is_object($val)) {
-				if (oci_bind_by_name($stmt, ":$col", $row[$col]) === false)
-					$this->reportQueryError($this->lastErrno(), $this->lastError(), $sql, __METHOD__);
-			}
+		if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
+			$e = oci_error( $this->mConn );
+			$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+			return false;
 		}
-		
-		$stmt = oci_parse($this->mConn, $sql);
-		foreach ($row as $col => $val) {
-			$col_type=$this->fieldInfo($this->tableName($table), $col)->type();
-			if ($col_type != 'BLOB' && $col_type != 'CLOB') {
-				if (is_object($val))
-					$val = $val->getData();
-				
-				if (preg_match('/^timestamp.*/i', $col_type) == 1 && strtolower($val) == 'infinity') 
+		foreach ( $row as $col => &$val ) {
+			$col_info = $this->fieldInfoMulti( $table, $col );
+			$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+
+			if ( $val === null ) {
+				// do nothing ... null was inserted in statement creation
+			} elseif ( $col_type != 'BLOB' && $col_type != 'CLOB' ) {
+				if ( is_object( $val ) ) {
+					$val = $val->fetch();
+				}
+
+				if ( preg_match( '/^timestamp.*/i', $col_type ) == 1 && strtolower( $val ) == 'infinity' ) {
 					$val = '31-12-2030 12:00:00.000000';
-				
-				if (oci_bind_by_name($stmt, ":$col", $wgLang->checkTitleEncoding($val)) === false)
-					$this->reportQueryError($this->lastErrno(), $this->lastError(), $sql, __METHOD__);
+				}
+
+				$val = ( $wgContLang != null ) ? $wgContLang->checkTitleEncoding( $val ) : $val;
+				if ( oci_bind_by_name( $stmt, ":$col", $val ) === false ) {
+					$e = oci_error( $stmt );
+					$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+					return false;
+				}
 			} else {
-				if (($lob[$col] = oci_new_descriptor($this->mConn, OCI_D_LOB)) === false) {
-					$e = oci_error($stmt);
-					throw new DBUnexpectedError($this, "Cannot create LOB descriptor: " . $e['message']);
+				if ( ( $lob[$col] = oci_new_descriptor( $this->mConn, OCI_D_LOB ) ) === false ) {
+					$e = oci_error( $stmt );
+					throw new DBUnexpectedError( $this, "Cannot create LOB descriptor: " . $e['message'] );
 				}
-					
-				if (is_object($val)) {
-					$lob[$col]->writeTemporary($val->getData());
-					oci_bind_by_name($stmt, ":$col", $lob[$col], -1, SQLT_BLOB);
+
+				if ( is_object( $val ) ) {
+					$val = $val->fetch();
+				}
+
+				if ( $col_type == 'BLOB' ) {
+					$lob[$col]->writeTemporary( $val, OCI_TEMP_BLOB );
+					oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, OCI_B_BLOB );
 				} else {
-					$lob[$col]->writeTemporary($val);
-					oci_bind_by_name($stmt, ":$col", $lob[$col], -1, OCI_B_CLOB);
+					$lob[$col]->writeTemporary( $val, OCI_TEMP_CLOB );
+					oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, OCI_B_CLOB );
 				}
 			}
 		}
-		
-		$olderr = error_reporting(E_ERROR);
-		if (oci_execute($stmt, OCI_DEFAULT) === false) {
-			$e = oci_error($stmt);
-			
-			if (!$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1')
-				$this->reportQueryError($e['message'], $e['code'], $sql, __METHOD__);
-			else
-				$this->mAffectedRows = oci_num_rows($stmt);
-		} else 
-			$this->mAffectedRows = oci_num_rows($stmt);
-		error_reporting($olderr);
-		
-		if (isset($lob)){
-			foreach ($lob as $lob_i => $lob_v) {
+
+		wfSuppressWarnings();
+
+		if ( oci_execute( $stmt, OCI_DEFAULT ) === false ) {
+			$e = oci_error( $stmt );
+			if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) {
+				$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+				return false;
+			} else {
+				$this->mAffectedRows = oci_num_rows( $stmt );
+			}
+		} else {
+			$this->mAffectedRows = oci_num_rows( $stmt );
+		}
+
+		wfRestoreWarnings();
+
+		if ( isset( $lob ) ) {
+			foreach ( $lob as $lob_v ) {
 				$lob_v->free();
 			}
 		}
-		
-		if (!$this->mTrxLevel)
-			oci_commit($this->mConn);
-		
-		oci_free_statement($stmt);
+
+		if ( !$this->mTrxLevel ) {
+			oci_commit( $this->mConn );
+		}
+
+		oci_free_statement( $stmt );
 	}
 
 	function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'DatabaseOracle::insertSelect',
 		$insertOptions = array(), $selectOptions = array() )
 	{
 		$destTable = $this->tableName( $destTable );
-		if( !is_array( $selectOptions ) ) {
+		if ( !is_array( $selectOptions ) ) {
 			$selectOptions = array( $selectOptions );
 		}
 		list( $startOpts, $useIndex, $tailOpts ) = $this->makeSelectOptions( $selectOptions );
-		if( is_array( $srcTable ) ) {
+		if ( is_array( $srcTable ) ) {
 			$srcTable =  implode( ',', array_map( array( &$this, 'tableName' ), $srcTable ) );
 		} else {
 			$srcTable = $this->tableName( $srcTable );
 		}
+
+		if ( ( $sequenceData = $this->getSequenceData( $destTable ) ) !== false &&
+				!isset( $varMap[$sequenceData['column']] ) )
+		{
+			$varMap[$sequenceData['column']] = 'GET_SEQUENCE_VALUE(\'' . $sequenceData['sequence'] . '\')';
+		}
+
+		// count-alias subselect fields to avoid abigious definition errors
+		$i = 0;
+		foreach ( $varMap as &$val ) {
+			$val = $val . ' field' . ( $i++ );
+		}
+
 		$sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
 			" SELECT $startOpts " . implode( ',', $varMap ) .
 			" FROM $srcTable $useIndex ";
@@ -520,14 +637,16 @@ class DatabaseOracle extends DatabaseBase {
 		}
 		$sql .= " $tailOpts";
 
-		if (in_array('IGNORE', $insertOptions)) 
+		if ( in_array( 'IGNORE', $insertOptions ) ) {
 			$this->ignore_DUP_VAL_ON_INDEX = true;
+		}
 
 		$retval = $this->query( $sql, $fname );
 
-		if (in_array('IGNORE', $insertOptions))
+		if ( in_array( 'IGNORE', $insertOptions ) ) {
 			$this->ignore_DUP_VAL_ON_INDEX = false;
-		
+		}
+
 		return $retval;
 	}
 
@@ -535,109 +654,133 @@ class DatabaseOracle extends DatabaseBase {
 		global $wgSharedDB, $wgSharedPrefix, $wgSharedTables;
 		/*
 		Replace reserved words with better ones
-		Useing uppercase, because that's the only way oracle can handle 
+		Using uppercase because that's the only way Oracle can handle
 		quoted tablenames
 		*/
 		switch( $name ) {
 			case 'user':
-				$name = 'MWUSER'; break;
+				$name = 'MWUSER';
+				break;
 			case 'text':
-				$name = 'PAGECONTENT'; break;
+				$name = 'PAGECONTENT';
+				break;
 		}
 
 		/*
 			The rest of procedure is equal to generic Databse class
 			except for the quoting style
 		*/
-		if ( $name[0] == '"' && substr( $name, -1, 1 ) == '"' ) return $name;
-
-		if( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) return $name;
+		if ( $name[0] == '"' && substr( $name, - 1, 1 ) == '"' ) {
+			return $name;
+		}
+		if ( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) {
+			return $name;
+		}
 		$dbDetails = array_reverse( explode( '.', $name, 2 ) );
-		if( isset( $dbDetails[1] ) ) @list( $table, $database ) = $dbDetails;
-		else                         @list( $table ) = $dbDetails;
-		
+		if ( isset( $dbDetails[1] ) ) {
+			@list( $table, $database ) = $dbDetails;
+		} else {
+			@list( $table ) = $dbDetails;
+		}
+
 		$prefix = $this->mTablePrefix;
-		
-		if( isset($database) ) $table = ( $table[0] == '`' ? $table : "`{$table}`" );
-		
-		if( !isset( $database ) 
-		 && isset( $wgSharedDB )
-		 && $table[0] != '"'
-		 && isset( $wgSharedTables )
-		 && is_array( $wgSharedTables )
-		 && in_array( $table, $wgSharedTables ) ) {
+
+		if ( isset( $database ) ) {
+			$table = ( $table[0] == '`' ? $table : "`{$table}`" );
+		}
+
+		if ( !isset( $database ) && isset( $wgSharedDB ) && $table[0] != '"'
+			&& isset( $wgSharedTables )
+			&& is_array( $wgSharedTables )
+			&& in_array( $table, $wgSharedTables )
+		) {
 			$database = $wgSharedDB;
 			$prefix   = isset( $wgSharedPrefix ) ? $wgSharedPrefix : $prefix;
 		}
-		
-		if( isset($database) ) $database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
-		$table = ( $table[0] == '"' ? $table : "\"{$prefix}{$table}\"" );
-		
-		$tableName = ( isset($database) ? "{$database}.{$table}" : "{$table}" );
-		
-		return strtoupper($tableName);
+
+		if ( isset( $database ) ) {
+			$database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
+		}
+		$table = ( $table[0] == '"') ? $table : "\"{$prefix}{$table}\"" ;
+
+		$tableName = ( isset( $database ) ? "{$database}.{$table}" : "{$table}" );
+
+		return strtoupper( $tableName );
 	}
 
 	/**
 	 * Return the next in a sequence, save the value for retrieval via insertId()
 	 */
-	function nextSequenceValue($seqName) {
-		$res = $this->query("SELECT $seqName.nextval FROM dual");
-		$row = $this->fetchRow($res);
+	function nextSequenceValue( $seqName ) {
+		$res = $this->query( "SELECT $seqName.nextval FROM dual" );
+		$row = $this->fetchRow( $res );
 		$this->mInsertId = $row[0];
-		$this->freeResult($res);
 		return $this->mInsertId;
 	}
 
-	# REPLACE query wrapper
-	# Oracle simulates this with a DELETE followed by INSERT
-	# $row is the row to insert, an associative array
-	# $uniqueIndexes is an array of indexes. Each element may be either a
-	# field name or an array of field names
-	#
-	# It may be more efficient to leave off unique indexes which are unlikely to collide.
-	# However if you do this, you run the risk of encountering errors which wouldn't have
-	# occurred in MySQL
+	/**
+	 * Return sequence_name if table has a sequence
+	 */
+	private function getSequenceData( $table ) {
+		if ( $this->sequenceData == null ) {
+			$result = $this->doQuery( 'SELECT lower(us.sequence_name), lower(utc.table_name), lower(utc.column_name) from user_sequences us, user_tab_columns utc where us.sequence_name = utc.table_name||\'_\'||utc.column_name||\'_SEQ\'' );
+
+			while ( ( $row = $result->fetchRow() ) !== false ) {
+				$this->sequenceData[$this->tableName( $row[1] )] = array(
+					'sequence' => $row[0],
+					'column' => $row[2]
+				);
+			}
+		}
+
+		return ( isset( $this->sequenceData[$table] ) ) ? $this->sequenceData[$table] : false;
+	}
+
+	/**
+	 * REPLACE query wrapper
+	 * Oracle simulates this with a DELETE followed by INSERT
+	 * $row is the row to insert, an associative array
+	 * $uniqueIndexes is an array of indexes. Each element may be either a
+	 * field name or an array of field names
+	 *
+	 * It may be more efficient to leave off unique indexes which are unlikely to collide.
+	 * However if you do this, you run the risk of encountering errors which wouldn't have
+	 * occurred in MySQL.
+	 *
+	 * @param $table String: table name
+	 * @param $uniqueIndexes Array: array of indexes. Each element may be
+	 *                       either a field name or an array of field names
+	 * @param $rows Array: rows to insert to $table
+	 * @param $fname String: function name, you can use __METHOD__ here
+	 */
 	function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabaseOracle::replace' ) {
-		$table = $this->tableName($table);
+		$table = $this->tableName( $table );
 
-		if (count($rows)==0) {
+		if ( count( $rows ) == 0 ) {
 			return;
 		}
 
 		# Single row case
-		if (!is_array(reset($rows))) {
-			$rows = array($rows);
+		if ( !is_array( reset( $rows ) ) ) {
+			$rows = array( $rows );
 		}
 
-		foreach( $rows as $row ) {
+		$sequenceData = $this->getSequenceData( $table );
+
+		foreach ( $rows as $row ) {
 			# Delete rows which collide
 			if ( $uniqueIndexes ) {
-				$sql = "DELETE FROM $table WHERE ";
-				$first = true;
+				$condsDelete = array();
 				foreach ( $uniqueIndexes as $index ) {
-					if ( $first ) {
-						$first = false;
-						$sql .= "(";
-					} else {
-						$sql .= ') OR (';
-					}
-					if ( is_array( $index ) ) {
-						$first2 = true;
-						foreach ( $index as $col ) {
-							if ( $first2 ) {
-								$first2 = false;
-							} else {
-								$sql .= ' AND ';
-							}
-							$sql .= $col.'=' . $this->addQuotes( $row[$col] );
-						}
-					} else {
-						$sql .= $index.'=' . $this->addQuotes( $row[$index] );
-					}
+					$condsDelete[$index] = $row[$index];
 				}
-				$sql .= ')';
-				$this->query( $sql, $fname );
+				if ( count( $condsDelete ) > 0 ) {
+					$this->delete( $table, $condsDelete, $fname );
+				}
+			}
+
+			if ( $sequenceData !== false && !isset( $row[$sequenceData['column']] ) ) {
+				$row[$sequenceData['column']] = $this->nextSequenceValue( $sequenceData['sequence'] );
 			}
 
 			# Now insert the row
@@ -646,9 +789,9 @@ class DatabaseOracle extends DatabaseBase {
 	}
 
 	# DELETE where the condition is a join
-	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = "DatabaseOracle::deleteJoin" ) {
+	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'DatabaseOracle::deleteJoin' ) {
 		if ( !$conds ) {
-			throw new DBUnexpectedError($this,  'DatabaseOracle::deleteJoin() called with empty $conds' );
+			throw new DBUnexpectedError( $this, 'DatabaseOracle::deleteJoin() called with empty $conds' );
 		}
 
 		$delTable = $this->tableName( $delTable );
@@ -664,98 +807,111 @@ class DatabaseOracle extends DatabaseBase {
 
 	# Returns the size of a text field, or -1 for "unlimited"
 	function textFieldSize( $table, $field ) {
-		$table = $this->tableName( $table );
-		$sql = "SELECT t.typname as ftype,a.atttypmod as size
-			FROM pg_class c, pg_attribute a, pg_type t
-			WHERE relname='$table' AND a.attrelid=c.oid AND
-				a.atttypid=t.oid and a.attname='$field'";
-		$res =$this->query($sql);
-		$row=$this->fetchObject($res);
-		if ($row->ftype=="varchar") {
-			$size=$row->size-4;
+		$fieldInfoData = $this->fieldInfo( $table, $field);
+		if ( $fieldInfoData->type == 'varchar' ) {
+			$size = $row->size - 4;
 		} else {
-			$size=$row->size;
+			$size = $row->size;
 		}
-		$this->freeResult( $res );
 		return $size;
 	}
 
-	function limitResult($sql, $limit, $offset) {
-		if ($offset === false)
+	function limitResult( $sql, $limit, $offset = false ) {
+		if ( $offset === false ) {
 			$offset = 0;
+		}
 		return "SELECT * FROM ($sql) WHERE rownum >= (1 + $offset) AND rownum < (1 + $limit + $offset)";
 	}
 
+	function encodeBlob( $b ) {
+		return new Blob( $b );
+	}
+
+	function decodeBlob( $b ) {
+		if ( $b instanceof Blob ) {
+			$b = $b->fetch();
+		}
+		return $b;
+	}
 
-	function unionQueries($sqls, $all = false) {
+	function unionQueries( $sqls, $all ) {
 		$glue = ' UNION ALL ';
-		return 'SELECT * '.($all?'':'/* UNION_UNIQUE */ ').'FROM ('.implode( $glue, $sqls ).')' ;
+		return 'SELECT * ' . ( $all ? '':'/* UNION_UNIQUE */ ' ) . 'FROM (' . implode( $glue, $sqls ) . ')' ;
+	}
+
+	public function unixTimestamp( $field ) {
+		return "((trunc($field) - to_date('19700101','YYYYMMDD')) * 86400)";
 	}
 
 	function wasDeadlock() {
 		return $this->lastErrno() == 'OCI-00060';
 	}
 
-	function timestamp($ts = 0) {
-		return wfTimestamp(TS_ORACLE, $ts);
+	function duplicateTableStructure( $oldName, $newName, $temporary = false, $fname = 'DatabaseOracle::duplicateTableStructure' ) {
+		global $wgDBprefix;
+		
+		$temporary = $temporary ? 'TRUE' : 'FALSE';
+
+		$newName = trim( strtoupper( $newName ), '"');
+		$oldName = trim( strtoupper( $oldName ), '"');
+
+		$tabName = substr( $newName, strlen( $wgDBprefix ) );
+		$oldPrefix = substr( $oldName, 0, strlen( $oldName ) - strlen( $tabName ) );
+
+		return $this->doQuery( 'BEGIN DUPLICATE_TABLE(\'' . $tabName . '\', \'' . $oldPrefix . '\', \'' . strtoupper( $wgDBprefix ) . '\', ' . $temporary . '); END;' );
+	}
+
+	function timestamp( $ts = 0 ) {
+		return wfTimestamp( TS_ORACLE, $ts );
 	}
 
 	/**
 	 * Return aggregated value function call
 	 */
-	function aggregateValue ($valuedata,$valuename='value') {
+	function aggregateValue ( $valuedata, $valuename = 'value' ) {
 		return $valuedata;
 	}
 
-	function reportQueryError($error, $errno, $sql, $fname, $tempIgnore = false) {
+	function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
 		# Ignore errors during error handling to avoid infinite
 		# recursion
-		$ignore = $this->ignoreErrors(true);
+		$ignore = $this->ignoreErrors( true );
 		++$this->mErrorCount;
 
-		if ($ignore || $tempIgnore) {
-//echo "error ignored! query = [$sql]\n";
-			wfDebug("SQL ERROR (ignored): $error\n");
+		if ( $ignore || $tempIgnore ) {
+			wfDebug( "SQL ERROR (ignored): $error\n" );
 			$this->ignoreErrors( $ignore );
-		}
-		else {
-//echo "error!\n";
-			$message = "A database error has occurred\n" .
-				"Query: $sql\n" .
-				"Function: $fname\n" .
-				"Error: $errno $error\n";
-			throw new DBUnexpectedError($this, $message);
+		} else {
+			throw new DBQueryError( $this, $error, $errno, $sql, $fname );
 		}
 	}
 
 	/**
 	 * @return string wikitext of a link to the server software's web site
 	 */
-	function getSoftwareLink() {
-		return "[http://www.oracle.com/ Oracle]";
+	public static function getSoftwareLink() {
+		return '[http://www.oracle.com/ Oracle]';
 	}
 
 	/**
 	 * @return string Version information from the database
 	 */
 	function getServerVersion() {
-		return oci_server_version($this->mConn);
-	}
-
-	/**
-	 * @return String: Database name for messages
-	*/
-	function getDBtype() {
-		return 'Oracle';
+		//better version number, fallback on driver
+		$rset = $this->doQuery( 'SELECT version FROM product_component_version WHERE UPPER(product) LIKE \'ORACLE DATABASE%\'' );
+		if ( !( $row =  $rset->fetchRow() ) ) {
+			return oci_server_version( $this->mConn );
+		} 
+		return $row['version'];
 	}
 
 	/**
 	 * Query whether a given table exists (in the given schema, or the default mw one if not given)
 	 */
-	function tableExists($table) {
+	function tableExists( $table ) {
 		$SQL = "SELECT 1 FROM user_tables WHERE table_name='$table'";
-		$res = $this->doQuery($SQL);
-		if ($res) {
+		$res = $this->doQuery( $SQL );
+		if ( $res ) {
 			$count = $res->numRows();
 			$res->free();
 		} else {
@@ -765,63 +921,87 @@ class DatabaseOracle extends DatabaseBase {
 	}
 
 	/**
-	 * Query whether a given column exists in the mediawiki schema
-	 * based on prebuilt table to simulate MySQL field info and keep query speed minimal
+	 * Function translates mysql_fetch_field() functionality on ORACLE.
+	 * Caching is present for reducing query time.
+	 * For internal calls. Use fieldInfo for normal usage.
+	 * Returns false if the field doesn't exist
+	 *
+	 * @param $table Array
+	 * @param $field String
 	 */
-	function fieldExists( $table, $field ) {
-		if (!isset($this->fieldInfo_stmt))
-			$this->fieldInfo_stmt = oci_parse($this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)');
-
-		oci_bind_by_name($this->fieldInfo_stmt, ':tab', trim($table, '"'));
-		oci_bind_by_name($this->fieldInfo_stmt, ':col', $field);
+	private function fieldInfoMulti( $table, $field ) {
+		$field = strtoupper( $field );
+		if ( is_array( $table ) ) {
+			$table = array_map( array( &$this, 'tableName' ), $table );
+			$tableWhere = 'IN (';
+			foreach( $table as &$singleTable ) {
+				$singleTable = strtoupper( trim( $singleTable, '"' ) );
+				if ( isset( $this->mFieldInfoCache["$singleTable.$field"] ) ) {
+					return $this->mFieldInfoCache["$singleTable.$field"];
+				}
+				$tableWhere .= '\'' . $singleTable . '\',';
+			}
+			$tableWhere = rtrim( $tableWhere, ',' ) . ')';
+		} else {
+			$table = strtoupper( trim( $this->tableName( $table ), '"' ) );
+			if ( isset( $this->mFieldInfoCache["$table.$field"] ) ) {
+				return $this->mFieldInfoCache["$table.$field"];
+			}
+			$tableWhere = '= \''.$table.'\'';
+		}
 
-		if (oci_execute($this->fieldInfo_stmt, OCI_DEFAULT) === false) {
-			$e = oci_error($this->fieldInfo_stmt);
-			$this->reportQueryError($e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__);
+		$fieldInfoStmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name '.$tableWhere.' and column_name = \''.$field.'\'' );
+		if ( oci_execute( $fieldInfoStmt, OCI_DEFAULT ) === false ) {
+			$e = oci_error( $fieldInfoStmt );
+			$this->reportQueryError( $e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__ );
 			return false;
 		}
-		$res = new ORAResult($this,$this->fieldInfo_stmt);
-		return $res->numRows() != 0;
+		$res = new ORAResult( $this, $fieldInfoStmt );
+		if ( $res->numRows() == 0 ) {
+			if ( is_array( $table ) ) {
+				foreach( $table as &$singleTable ) {
+					$this->mFieldInfoCache["$singleTable.$field"] = false;
+				}
+			} else {
+				$this->mFieldInfoCache["$table.$field"] = false;
+			}
+			$fieldInfoTemp = null;
+		} else {
+			$fieldInfoTemp = new ORAField( $res->fetchRow() );
+			$table = $fieldInfoTemp->tableName();
+			$this->mFieldInfoCache["$table.$field"] = $fieldInfoTemp;
+		}
+		$res->free();
+		return $fieldInfoTemp;
 	}
 
 	function fieldInfo( $table, $field ) {
-		if (!isset($this->fieldInfo_stmt))
-			$this->fieldInfo_stmt = oci_parse($this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)');
-
-		oci_bind_by_name($this->fieldInfo_stmt, ':tab', trim($table, '"'));
-		oci_bind_by_name($this->fieldInfo_stmt, ':col', $field);
-
-		if (oci_execute($this->fieldInfo_stmt, OCI_DEFAULT) === false) {
-			$e = oci_error($this->fieldInfo_stmt);
-			$this->reportQueryError($e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__);
-			return false;
+		if ( is_array( $table ) ) {
+			throw new DBUnexpectedError( $this, 'DatabaseOracle::fieldInfo called with table array!' );
 		}
-		$res = new ORAResult($this,$this->fieldInfo_stmt);
-		return new ORAField($res->fetchRow());
+		return $this->fieldInfoMulti ($table, $field);
 	}
 
 	function begin( $fname = '' ) {
 		$this->mTrxLevel = 1;
 	}
-	function immediateCommit( $fname = '' ) {
-		return true;
-	}
+
 	function commit( $fname = '' ) {
-		oci_commit($this->mConn);
+		oci_commit( $this->mConn );
 		$this->mTrxLevel = 0;
 	}
 
 	/* Not even sure why this is used in the main codebase... */
-	function limitResultForUpdate($sql, $num) {
+	function limitResultForUpdate( $sql, $num ) {
 		return $sql;
 	}
 
 	/* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}'; */
-	function sourceStream( $fp, $lineCallback = false, $resultCallback = false ) {
-		$cmd = "";
+	function sourceStream( $fp, $lineCallback = false, $resultCallback = false, $fname = 'DatabaseOracle::sourceStream' ) {
+		$cmd = '';
 		$done = false;
 		$dollarquote = false;
-		
+
 		$replacements = array();
 
 		while ( ! feof( $fp ) ) {
@@ -831,46 +1011,51 @@ class DatabaseOracle extends DatabaseBase {
 			$line = trim( fgets( $fp, 1024 ) );
 			$sl = strlen( $line ) - 1;
 
-			if ( $sl < 0 ) { continue; }
-			if ( '-' == $line{0} && '-' == $line{1} ) { continue; }
+			if ( $sl < 0 ) {
+				continue;
+			}
+			if ( '-' == $line { 0 } && '-' == $line { 1 } ) {
+				continue;
+			}
 
 			// Allow dollar quoting for function declarations
-			if (substr($line,0,8) == '/*$mw$*/') {
-				if ($dollarquote) {
+			if ( substr( $line, 0, 8 ) == '/*$mw$*/' ) {
+				if ( $dollarquote ) {
 					$dollarquote = false;
+					$line = str_replace( '/*$mw$*/', '', $line ); // remove dollarquotes
 					$done = true;
-				}
-				else {
+				} else {
 					$dollarquote = true;
 				}
-			}
-			else if (!$dollarquote) {
-				if ( ';' == $line{$sl} && ($sl < 2 || ';' != $line{$sl - 1})) {
+			} elseif ( !$dollarquote ) {
+				if ( ';' == $line { $sl } && ( $sl < 2 || ';' != $line { $sl - 1 } ) ) {
 					$done = true;
 					$line = substr( $line, 0, $sl );
 				}
 			}
 
-			if ( '' != $cmd ) { $cmd .= ' '; }
+			if ( $cmd != '' ) {
+				$cmd .= ' ';
+			}
 			$cmd .= "$line\n";
 
 			if ( $done ) {
-				$cmd = str_replace(';;', ";", $cmd);
-				if (strtolower(substr($cmd, 0, 6)) == 'define' ) {
-					if (preg_match('/^define\s*([^\s=]*)\s*=\s*\'\{\$([^\}]*)\}\'/', $cmd, $defines)) {
+				$cmd = str_replace( ';;', ";", $cmd );
+				if ( strtolower( substr( $cmd, 0, 6 ) ) == 'define' ) {
+					if ( preg_match( '/^define\s*([^\s=]*)\s*=\s*\'\{\$([^\}]*)\}\'/', $cmd, $defines ) ) {
 						$replacements[$defines[2]] = $defines[1];
 					}
 				} else {
-					foreach ( $replacements as $mwVar=>$scVar ) {
-						$cmd = str_replace( '&' . $scVar . '.', '{$'.$mwVar.'}', $cmd );
+					foreach ( $replacements as $mwVar => $scVar ) {
+						$cmd = str_replace( '&' . $scVar . '.', '{$' . $mwVar . '}', $cmd );
 					}
 
 					$cmd = $this->replaceVars( $cmd );
-					$res = $this->query( $cmd, __METHOD__ );
+					$res = $this->doQuery( $cmd );
 					if ( $resultCallback ) {
 						call_user_func( $resultCallback, $res, $this );
 					}
-	
+
 					if ( false === $res ) {
 						$err = $this->lastError();
 						return "Query \"{$cmd}\" failed with error code \"$err\".\n";
@@ -884,62 +1069,50 @@ class DatabaseOracle extends DatabaseBase {
 		return true;
 	}
 
-	function setup_database() {
-		global $wgVersion, $wgDBmwschema, $wgDBts2schema, $wgDBport, $wgDBuser;
-		
-		echo "<li>Creating DB objects</li>\n";
-		$res = dbsource( "../maintenance/ora/tables.sql", $this);
-		
-		// Avoid the non-standard "REPLACE INTO" syntax
-		echo "<li>Populating table interwiki</li>\n";
-		$f = fopen( "../maintenance/interwiki.sql", 'r' );
-		if ($f == false ) {
-			dieout( "<li>Could not find the interwiki.sql file</li>");
-		}
-		
-		//do it like the postgres :D
-		$SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES ";
-		while ( ! feof( $f ) ) {
-			$line = fgets($f,1024);
-			$matches = array();
-			if (!preg_match('/^\s*(\(.+?),(\d)\)/', $line, $matches)) {
-				continue;
+	function selectDB( $db ) {
+		if ( $db == null || $db == $this->mUser ) { return true; }
+		$sql = 'ALTER SESSION SET CURRENT_SCHEMA=' . strtoupper($db);
+		$stmt = oci_parse( $this->mConn, $sql );
+		if ( !oci_execute( $stmt ) ) {
+			$e = oci_error( $stmt );
+			if ( $e['code'] != '1435' ) {
+				$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
 			}
-			$this->query("$SQL $matches[1],$matches[2])");
+			return false;
 		}
-
-		echo "<li>Table interwiki successfully populated</li>\n";
-	}
-
-	function strencode($s) {
-		return str_replace("'", "''", $s);
+		return true;
 	}
 
-	function encodeBlob($b) {
-		return new ORABlob($b);
-	}
-	function decodeBlob($b) {
-		return $b; //return $b->load();
+	function strencode( $s ) {
+		return str_replace( "'", "''", $s );
 	}
 
 	function addQuotes( $s ) {
-		global $wgLang;
-		if (isset($wgLang->mLoaded) && $wgLang->mLoaded)
-			$s = $wgLang->checkTitleEncoding($s);
-		return "'" . $this->strencode($s) . "'";
-	}
-
-	function quote_ident( $s ) {
-		return $s;
+		global $wgContLang;
+		if ( isset( $wgContLang->mLoaded ) && $wgContLang->mLoaded ) {
+			$s = $wgContLang->checkTitleEncoding( $s );
+		}
+		return "'" . $this->strencode( $s ) . "'";
 	}
 
 	function selectRow( $table, $vars, $conds, $fname = 'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) {
-		if (is_array($table)) 
-			foreach ($table as $tab)
-				$tab = $this->tableName($tab);
-		else
-			$table = $this->tableName($table);
-		return parent::selectRow($table, $vars, $conds, $fname, $options, $join_conds);
+		global $wgContLang;
+
+		$conds2 = array();
+		$conds = ( $conds != null && !is_array( $conds ) ) ? array( $conds ) : $conds;
+		foreach ( $conds as $col => $val ) {
+			$col_info = $this->fieldInfoMulti( $table, $col );
+			$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+			if ( $col_type == 'CLOB' ) {
+				$conds2['TO_CHAR(' . $col . ')'] = $wgContLang->checkTitleEncoding( $val );
+			} elseif ( $col_type == 'VARCHAR2' && !mb_check_encoding( $val ) ) {
+				$conds2[$col] = $wgContLang->checkTitleEncoding( $val );
+			} else {
+				$conds2[$col] = $val;
+			}
+		}
+		
+		return parent::selectRow( $table, $vars, $conds2, $fname, $options, $join_conds );
 	}
 
 	/**
@@ -963,12 +1136,18 @@ class DatabaseOracle extends DatabaseBase {
 			}
 		}
 
-		if ( isset( $options['GROUP BY'] ) ) $preLimitTail .= " GROUP BY {$options['GROUP BY']}";
-		if ( isset( $options['ORDER BY'] ) ) $preLimitTail .= " ORDER BY {$options['ORDER BY']}";
+		if ( isset( $options['GROUP BY'] ) ) {
+			$preLimitTail .= " GROUP BY {$options['GROUP BY']}";
+		}
+		if ( isset( $options['ORDER BY'] ) ) {
+			$preLimitTail .= " ORDER BY {$options['ORDER BY']}";
+		}
 
-		#if ( isset( $noKeyOptions['FOR UPDATE'] ) ) $tailOpts .= ' FOR UPDATE';
-		#if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) $tailOpts .= ' LOCK IN SHARE MODE';
-		if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) $startOpts .= 'DISTINCT';
+		# if ( isset( $noKeyOptions['FOR UPDATE'] ) ) $tailOpts .= ' FOR UPDATE';
+		# if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) $tailOpts .= ' LOCK IN SHARE MODE';
+		if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) {
+			$startOpts .= 'DISTINCT';
+		}
 
 		if ( isset( $options['USE INDEX'] ) && ! is_array( $options['USE INDEX'] ) ) {
 			$useIndex = $this->useIndexClause( $options['USE INDEX'] );
@@ -979,65 +1158,143 @@ class DatabaseOracle extends DatabaseBase {
 		return array( $startOpts, $useIndex, $preLimitTail, $postLimitTail );
 	}
 
-	/* redundand ... will remove after confirming bitwise operations functionality
-	public function makeList( $a, $mode = LIST_COMMA ) {
-        	if ( !is_array( $a ) ) {
-			throw new DBUnexpectedError( $this, 'DatabaseOracle::makeList called with incorrect parameters' );
-		}
-		$a2 = array();
-		foreach ($a as $key => $value) {
-			if (strpos($key, ' & ') !== FALSE)
-				$a2[preg_replace('/(.*)\s&\s(.*)/', 'BITAND($1, $2)', $key)] = $value;
-			elseif (strpos($key, ' | ') !== FALSE)
-				$a2[preg_replace('/(.*)\s|\s(.*)/', 'BITOR($1, $2)', $key)] = $value;
-			elseif (!is_array($value)) {
-				if (strpos($value, ' = ') !== FALSE) {
-					if (strpos($value, ' & ') !== FALSE)
-						$a2[$key] = preg_replace('/(.*)\s&\s(.*?)\s=\s(.*)/', 'BITAND($1, $2) = $3', $value);
-					elseif (strpos($value, ' | ') !== FALSE)
-						$a2[$key] = preg_replace('/(.*)\s|\s(.*?)\s=\s(.*)/', 'BITOR($1, $2) = $3', $value);
-					else $a2[$key] = $value;
-				} 
-				elseif (strpos($value, ' & ') !== FALSE)
-					$a2[$key] = preg_replace('/(.*)\s&\s(.*)/', 'BITAND($1, $2)', $value);
-				elseif (strpos($value, ' | ') !== FALSE)
-					$a2[$key] = preg_replace('/(.*)\s|\s(.*)/', 'BITOR($1, $2)', $value);
-				else
-					$a2[$key] = $value;
+	public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) {
+		global $wgContLang;
+
+		if ( $wgContLang != null && $conds != '*' ) {
+			$conds2 = array();
+			$conds = ( $conds != null && !is_array( $conds ) ) ? array( $conds ) : $conds;
+			foreach ( $conds as $col => $val ) {
+				$col_info = $this->fieldInfoMulti( $table, $col );
+				$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+				if ( $col_type == 'CLOB' ) {
+					$conds2['TO_CHAR(' . $col . ')'] = $wgContLang->checkTitleEncoding( $val );
+				} else {
+					if ( is_array( $val ) ) {
+						$conds2[$col] = $val;
+						foreach ( $conds2[$col] as &$val2 ) {
+							$val2 = $wgContLang->checkTitleEncoding( $val2 );
+						}
+					} else {
+						$conds2[$col] = $wgContLang->checkTitleEncoding( $val );
+					}
+				}
 			}
-			else
-				$a2[$key] = $value;
-		}
 
-		return parent::makeList($a2, $mode);
+			return parent::delete( $table, $conds2, $fname );
+		} else {
+			return parent::delete( $table, $conds, $fname );
+		}
 	}
-	*/
 
-	function bitNot($field) {
-		//expecting bit-fields smaller than 4bytes
-		return 'BITNOT('.$bitField.')';
+	function update( $table, $values, $conds, $fname = 'DatabaseOracle::update', $options = array() ) {
+		global $wgContLang;
+		
+		$table = $this->tableName( $table );
+		$opts = $this->makeUpdateOptions( $options );
+		$sql = "UPDATE $opts $table SET ";
+		
+		$first = true;
+		foreach ( $values as $col => &$val ) {
+			$sqlSet = $this->fieldBindStatement( $table, $col, $val, true );
+			
+			if ( !$first ) {
+				$sqlSet = ', ' . $sqlSet;
+			} else {
+				$first = false;
+			}
+			$sql .= $sqlSet;
+		}
+
+		if ( $conds != '*' ) {
+			$sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
+		}
+
+		if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
+			$e = oci_error( $this->mConn );
+			$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+			return false;
+		}
+		foreach ( $values as $col => &$val ) {
+			$col_info = $this->fieldInfoMulti( $table, $col );
+			$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+
+			if ( $val === null ) {
+				// do nothing ... null was inserted in statement creation
+			} elseif ( $col_type != 'BLOB' && $col_type != 'CLOB' ) {
+				if ( is_object( $val ) ) {
+					$val = $val->getData();
+				}
+
+				if ( preg_match( '/^timestamp.*/i', $col_type ) == 1 && strtolower( $val ) == 'infinity' ) {
+					$val = '31-12-2030 12:00:00.000000';
+				}
+
+				$val = ( $wgContLang != null ) ? $wgContLang->checkTitleEncoding( $val ) : $val;
+				if ( oci_bind_by_name( $stmt, ":$col", $val ) === false ) {
+					$e = oci_error( $stmt );
+					$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+					return false;
+				}
+			} else {
+				if ( ( $lob[$col] = oci_new_descriptor( $this->mConn, OCI_D_LOB ) ) === false ) {
+					$e = oci_error( $stmt );
+					throw new DBUnexpectedError( $this, "Cannot create LOB descriptor: " . $e['message'] );
+				}
+
+				if ( $col_type == 'BLOB' ) { 
+					$lob[$col]->writeTemporary( $val ); 
+					oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, SQLT_BLOB );
+				} else {
+					$lob[$col]->writeTemporary( $val );
+					oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, OCI_B_CLOB );
+				}
+			}
+		}
+
+		wfSuppressWarnings();
+
+		if ( oci_execute( $stmt, OCI_DEFAULT ) === false ) {
+			$e = oci_error( $stmt );
+			if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) {
+				$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+				return false;
+			} else {
+				$this->mAffectedRows = oci_num_rows( $stmt );
+			}
+		} else {
+			$this->mAffectedRows = oci_num_rows( $stmt );
+		}
+
+		wfRestoreWarnings();
+
+		if ( isset( $lob ) ) {
+			foreach ( $lob as $lob_v ) {
+				$lob_v->free();
+			}
+		}
+
+		if ( !$this->mTrxLevel ) {
+			oci_commit( $this->mConn );
+		}
+
+		oci_free_statement( $stmt );
 	}
 
-	function bitAnd($fieldLeft, $fieldRight) {
-		return 'BITAND('.$fieldLeft.', '.$fieldRight.')';
+	function bitNot( $field ) {
+		// expecting bit-fields smaller than 4bytes
+		return 'BITNOT(' . $field . ')';
 	}
 
-	function bitOr($fieldLeft, $fieldRight) {
-		return 'BITOR('.$fieldLeft.', '.$fieldRight.')';
+	function bitAnd( $fieldLeft, $fieldRight ) {
+		return 'BITAND(' . $fieldLeft . ', ' . $fieldRight . ')';
 	}
 
-	/**
-	 * How lagged is this slave?
-	 *
-	 * @return int
-	 */
-	public function getLag() {
-		# Not implemented for Oracle
-		return 0;
+	function bitOr( $fieldLeft, $fieldRight ) {
+		return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
 	}
 
-	function setFakeSlaveLag( $lag ) {}
-	function setFakeMaster( $enabled = true ) {}
+	function setFakeMaster( $enabled = true ) { }
 
 	function getDBname() {
 		return $this->mDBname;
@@ -1046,38 +1303,20 @@ class DatabaseOracle extends DatabaseBase {
 	function getServer() {
 		return $this->mServer;
 	}
-	
+
 	public function replaceVars( $ins ) {
-		$varnames = array('wgDBprefix');
-		if ($this->mFlags & DBO_SYSDBA) {
-			$varnames[] = 'wgDBOracleDefTS';
-			$varnames[] = 'wgDBOracleTempTS';
-		}
-
-		// Ordinary variables
-		foreach ( $varnames as $var ) {
-			if( isset( $GLOBALS[$var] ) ) {
-				$val = addslashes( $GLOBALS[$var] ); // FIXME: safety check?
-				$ins = str_replace( '{$' . $var . '}', $val, $ins );
-				$ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
-				$ins = str_replace( '/*$' . $var . '*/', $val, $ins );
-			}
+		$varnames = array( 'wgDBprefix' );
+		if ( $this->mFlags & DBO_SYSDBA ) {
+			$varnames[] = '_OracleDefTS';
+			$varnames[] = '_OracleTempTS';
 		}
 
-		return parent::replaceVars($ins);
-	}
+		$ins = $this->replaceGlobalVars( $ins, $varnames );
 
-	/** 
-	 * No-op lock functions
-	 */
-	public function lock( $lockName, $method ) {
-		return true;
+		return parent::replaceVars( $ins );
 	}
-	public function unlock( $lockName, $method ) {
-		return true;
-	}
-	
+
 	public function getSearchEngine() {
-		return "SearchOracle";
+		return 'SearchOracle';
 	}
 } // end DatabaseOracle class