update to MediaWiki 1.16.0

1 files changed, 762 insertions, 287 deletions

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 4c37a507..bd60bbf8 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -11,7 +11,7 @@
 class ORABlob {
 	var $mData;
 
-	function __construct($data) {
+	function __construct( $data ) {
 		$this->mData = $data;
 	}
 
@@ -31,58 +31,80 @@ class ORAResult {
 	private $cursor;
 	private $stmt;
 	private $nrows;
-	private $db;
 
-	function __construct(&$db, $stmt) {
+	private $unique;
+	private function array_unique_md( $array_in ) {
+		$array_out = array();
+		$array_hashes = array();
+
+		foreach ( $array_in as $key => $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 ) {
 		$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'], '', __FUNCTION__ );
 			return;
 		}
 
+		if ( $unique ) {
+			$this->rows = $this->array_unique_md( $this->rows );
+			$this->nrows = count( $this->rows );
+		}
+
 		$this->cursor = 0;
 		$this->stmt = $stmt;
 	}
 
-	function free() {
-		oci_free_statement($this->stmt);
+	public function free() {
+		oci_free_statement( $this->stmt );
 	}
 
-	function seek($row) {
-		$this->cursor = min($row, $this->nrows);
+	public function seek( $row ) {
+		$this->cursor = min( $row, $this->nrows );
 	}
 
-	function numRows() {
+	public function numRows() {
 		return $this->nrows;
 	}
 
-	function numFields() {
-		return oci_num_fields($this->stmt);
+	public function numFields() {
+		return oci_num_fields( $this->stmt );
 	}
 
-	function fetchObject() {
-		if ($this->cursor >= $this->nrows)
+	public function fetchObject() {
+		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 = strtolower( oci_field_name( $this->stmt, $k + 1 ) );
 			$ret->$lc = $v;
 		}
 
 		return $ret;
 	}
 
-	function fetchAssoc() {
-		if ($this->cursor >= $this->nrows)
+	public function fetchRow() {
+		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 = strtolower( oci_field_name( $this->stmt, $k + 1 ) );
 			$ret[$lc] = $v;
 			$ret[$k] = $v;
 		}
@@ -91,30 +113,87 @@ class ORAResult {
 }
 
 /**
+ * Utility class.
+ * @ingroup Database
+ */
+class ORAField {
+	private $name, $tablename, $default, $max_length, $nullable,
+		$is_pk, $is_unique, $is_multiple, $is_key, $type;
+
+	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->type = $info['data_type'];
+	}
+
+	function name() {
+		return $this->name;
+	}
+
+	function tableName() {
+		return $this->tablename;
+	}
+
+	function defaultValue() {
+		return $this->default;
+	}
+
+	function maxLength() {
+		return $this->max_length;
+	}
+
+	function nullable() {
+		return $this->nullable;
+	}
+
+	function isKey() {
+		return $this->is_key;
+	}
+
+	function isMultipleKey() {
+		return $this->is_multiple;
+	}
+
+	function type() {
+		return $this->type;
+	}
+}
+
+/**
  * @ingroup Database
  */
-class DatabaseOracle extends Database {
-	var $mInsertId = NULL;
-	var $mLastResult = NULL;
-	var $numeric_version = NULL;
+class DatabaseOracle extends DatabaseBase {
+	var $mInsertId = null;
+	var $mLastResult = null;
+	var $numeric_version = null;
 	var $lastResult = null;
 	var $cursor = 0;
 	var $mAffectedRows;
 
-	function DatabaseOracle($server = false, $user = false, $password = false, $dbName = false,
-		$failFunction = false, $flags = 0 )
-	{
+	var $ignore_DUP_VAL_ON_INDEX = false;
+	var $sequenceData = null;
 
-		global $wgOut;
-		# Can't get a reference if it hasn't been set yet
-		if ( !isset( $wgOut ) ) {
-			$wgOut = NULL;
-		}
-		$this->mOut =& $wgOut;
-		$this->mFailFunction = $failFunction;
-		$this->mFlags = $flags;
-		$this->open( $server, $user, $password, $dbName);
+	var $defaultCharset = 'AL32UTF8';
+
+	var $mFieldInfoCache = array();
+
+	function __construct( $server = false, $user = false, $password = false, $dbName = false,
+		$failFunction = 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 ) );
+	}
 
+	function getType() {
+		return 'oracle';
 	}
 
 	function cascadingDeletes() {
@@ -139,8 +218,7 @@ class DatabaseOracle extends Database {
 		return true;
 	}
 
-	static function newFromParams( $server = false, $user = false, $password = false, $dbName = false,
-		$failFunction = false, $flags = 0)
+	static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 )
 	{
 		return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags );
 	}
@@ -154,30 +232,35 @@ class DatabaseOracle extends Database {
 			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" );
 		}
 
-		# Needed for proper UTF-8 functionality
-		putenv("NLS_LANG=AMERICAN_AMERICA.AL32UTF8");
-
 		$this->close();
 		$this->mServer = $server;
 		$this->mUser = $user;
 		$this->mPassword = $password;
 		$this->mDBname = $dbName;
 
-		if (!strlen($user)) { ## e.g. the class is being loaded
+		if ( !strlen( $user ) ) { # e.g. the class is being loaded
 			return;
 		}
 
-		error_reporting( E_ALL );
-		$this->mConn = oci_connect($user, $password, $dbName);
+		$session_mode = $this->mFlags & DBO_SYSDBA ? OCI_SYSDBA : OCI_DEFAULT;
+		if ( $this->mFlags & DBO_DEFAULT ) {
+			$this->mConn = oci_new_connect( $user, $password, $dbName, $this->defaultCharset, $session_mode );
+		} else {
+			$this->mConn = oci_connect( $user, $password, $dbName, $this->defaultCharset, $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");
+		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;
 		}
 
 		$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\'' );
 		return $this->mConn;
 	}
 
@@ -198,55 +281,101 @@ class DatabaseOracle extends Database {
 		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" );
 		}
 
-		if (($this->mLastResult = $stmt = oci_parse($this->mConn, $sql)) === false) {
-			$e = oci_error($this->mConn);
-			$this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+		// 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 (oci_execute($stmt, $this->execFlags()) == false) {
-			$e = oci_error($stmt);
-			$this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+		wfSuppressWarnings();
+
+		if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
+			$e = oci_error( $this->mConn );
+			$this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ );
+			return false;
+		}
+
+		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__ );
+				return false;
+			}
 		}
-		if (oci_statement_type($stmt) == "SELECT")
-			return new ORAResult($this, $stmt);
-		else {
-			$this->mAffectedRows = oci_num_rows($stmt);
+		
+		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 );
 			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) {
-		$res->free();
+	function freeResult( $res ) {
+		if ( $res instanceof ORAResult ) {
+			$res->free();
+		} else {
+			$res->result->free();
+		}
 	}
 
-	function fetchObject($res) {
-		return $res->fetchObject();
+	function fetchObject( $res ) {
+		if ( $res instanceof ORAResult ) {
+			return $res->numRows();
+		} else {
+			return $res->result->fetchObject();
+		}
 	}
 
-	function fetchRow($res) {
-		return $res->fetchAssoc();
+	function fetchRow( $res ) {
+		if ( $res instanceof ORAResult ) {
+			return $res->fetchRow();
+		} else {
+			return $res->result->fetchRow();
+		}
 	}
 
-	function numRows($res) {
-		return $res->numRows();
+	function numRows( $res ) {
+		if ( $res instanceof ORAResult ) {
+			return $res->numRows();
+		} else {
+			return $res->result->numRows();
+		}
 	}
 
-	function numFields($res) {
-		return $res->numFields();
+	function numFields( $res ) {
+		if ( $res instanceof ORAResult ) {
+			return $res->numFields();
+		} else {
+			return $res->result->numFields();
+		}
 	}
 
-	function fieldName($stmt, $n) {
-		return pg_field_name($stmt, $n);
+	function fieldName( $stmt, $n ) {
+		return oci_field_name( $stmt, $n );
 	}
 
 	/**
@@ -256,23 +385,29 @@ class DatabaseOracle extends Database {
 		return $this->mInsertId;
 	}
 
-	function dataSeek($res, $row) {
-		$res->seek($row);
+	function dataSeek( $res, $row ) {
+		if ( $res instanceof ORAResult ) {
+			$res->seek( $row );
+		} else {
+			$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'];
 	}
 
@@ -284,122 +419,261 @@ class DatabaseOracle extends Database {
 	 * Returns information about an index
 	 * If errors are explicitly ignored, returns NULL on failure
 	 */
-	function indexInfo( $table, $index, $fname = 'Database::indexExists' ) {
+	function indexInfo( $table, $index, $fname = 'DatabaseOracle::indexExists' ) {
 		return false;
 	}
 
-	function indexUnique ($table, $index, $fname = 'Database::indexUnique' ) {
+	function indexUnique( $table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
 		return false;
 	}
 
-	function insert( $table, $a, $fname = 'Database::insert', $options = array() ) {
-		if (!is_array($options))
-			$options = array($options);
+	function insert( $table, $a, $fname = 'DatabaseOracle::insert', $options = array() ) {
+		if ( !count( $a ) ) {
+			return true;
+		}
+
+		if ( !is_array( $options ) ) {
+			$options = array( $options );
+		}
 
-		#if (in_array('IGNORE', $options))
-		#	$oldIgnore = $this->ignoreErrors(true);
+		if ( in_array( 'IGNORE', $options ) ) {
+			$this->ignore_DUP_VAL_ON_INDEX = true;
+		}
 
-		# IGNORE is performed using single-row inserts, ignoring errors in each
-		# FIXME: need some way to distiguish between key collision and other types of error
-		//$oldIgnore = $this->ignoreErrors(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 );
 		}
-		//$this->ignoreErrors($oldIgnore);
 		$retVal = true;
 
-		//if (in_array('IGNORE', $options))
-		//	$this->ignoreErrors($oldIgnore);
+		if ( in_array( 'IGNORE', $options ) ) {
+			$this->ignore_DUP_VAL_ON_INDEX = false;
+		}
 
 		return $retVal;
 	}
 
-	function insertOneRow($table, $row, $fname) {
+	private function insertOneRow( $table, $row, $fname ) {
+		global $wgLang;
+
+		$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;
-		$returning = '';
-		foreach ($row as $col => $val) {
-			if (is_object($val)) {
-				$what = "EMPTY_BLOB()";
-				assert($returning === '');
-				$returning = " RETURNING $col INTO :bval";
-				$blobcol = $col;
-			} else
-				$what = ":$col";
-
-			if ($first)
-				$sql .= "$what";
-			else
-				$sql.= ", $what";
+		foreach ( $row as $col => $val ) {
+			if ( $first ) {
+				$sql .= $val !== null ? ':' . $col : 'NULL';
+			} else {
+				$sql .= $val !== null ? ', :' . $col : ', NULL';
+			}
+
 			$first = false;
 		}
-		$sql .= ") $returning";
+		$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__);
+		$stmt = oci_parse( $this->mConn, $sql );
+		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->getData();
+				}
+
+				if ( preg_match( '/^timestamp.*/i', $col_type ) == 1 && strtolower( $val ) == 'infinity' ) {
+					$val = '31-12-2030 12:00:00.000000';
+				}
+
+				$val = ( $wgLang != null ) ? $wgLang->checkTitleEncoding( $val ) : $val;
+				if ( oci_bind_by_name( $stmt, ":$col", $val ) === false ) {
+					$this->reportQueryError( $this->lastErrno(), $this->lastError(), $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' ) { // is_object($val)) {
+					$lob[$col]->writeTemporary( $val ); // ->getData());
+					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 );
+				}
 			}
 		}
 
-		if (($bval = oci_new_descriptor($this->mConn, OCI_D_LOB)) === false) {
-			$e = oci_error($stmt);
-			throw new DBUnexpectedError($this, "Cannot create LOB descriptor: " . $e['message']);
+		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_i => $lob_v ) {
+				$lob_v->free();
+			}
+		}
+
+		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 ) ) {
+			$selectOptions = array( $selectOptions );
+		}
+		list( $startOpts, $useIndex, $tailOpts ) = $this->makeSelectOptions( $selectOptions );
+		if ( is_array( $srcTable ) ) {
+			$srcTable =  implode( ',', array_map( array( &$this, 'tableName' ), $srcTable ) );
+		} else {
+			$srcTable = $this->tableName( $srcTable );
 		}
 
-		if (strlen($returning))
-			oci_bind_by_name($stmt, ":bval", $bval, -1, SQLT_BLOB);
+		if ( ( $sequenceData = $this->getSequenceData( $destTable ) ) !== false &&
+				!isset( $varMap[$sequenceData['column']] ) )
+			$varMap[$sequenceData['column']] = 'GET_SEQUENCE_VALUE(\'' . $sequenceData['sequence'] . '\')';
 
-		if (oci_execute($stmt, OCI_DEFAULT) === false) {
-			$e = oci_error($stmt);
-			$this->reportQueryError($e['message'], $e['code'], $sql, __METHOD__);
+		// count-alias subselect fields to avoid abigious definition errors
+		$i = 0;
+		foreach ( $varMap as $key => &$val ) {
+			$val = $val . ' field' . ( $i++ );
 		}
-		if (strlen($returning)) {
-			$bval->save($row[$blobcol]->getData());
-			$bval->free();
+
+		$sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
+			" SELECT $startOpts " . implode( ',', $varMap ) .
+			" FROM $srcTable $useIndex ";
+		if ( $conds != '*' ) {
+			$sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
+		}
+		$sql .= " $tailOpts";
+
+		if ( in_array( 'IGNORE', $insertOptions ) ) {
+			$this->ignore_DUP_VAL_ON_INDEX = true;
 		}
-		if (!$this->mTrxLevel)
-			oci_commit($this->mConn);
 
-		oci_free_statement($stmt);
+		$retval = $this->query( $sql, $fname );
+
+		if ( in_array( 'IGNORE', $insertOptions ) ) {
+			$this->ignore_DUP_VAL_ON_INDEX = false;
+		}
+
+		return $retval;
 	}
 
 	function tableName( $name ) {
-		# Replace reserved words with better ones
+		global $wgSharedDB, $wgSharedPrefix, $wgSharedTables;
+		/*
+		Replace reserved words with better ones
+		Using uppercase because that's the only way Oracle can handle
+		quoted tablenames
+		*/
 		switch( $name ) {
 			case 'user':
-				return 'mwuser';
+				$name = 'MWUSER';
+				break;
 			case 'text':
-				return 'pagecontent';
-			default:
-				return $name;
+				$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;
+		}
+		$dbDetails = array_reverse( explode( '.', $name, 2 ) );
+		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 )
+		) {
+			$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 );
 	}
 
 	/**
 	 * 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);
+		$this->freeResult( $res );
 		return $this->mInsertId;
 	}
 
 	/**
-	 * Oracle does not have a "USE INDEX" clause, so return an empty string
+	 * Return sequence_name if table has a sequence
 	 */
-	function useIndexClause($index) {
-		return '';
+	private function getSequenceData( $table ) {
+		if ( $this->sequenceData == null ) {
+			$result = $this->query( "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
@@ -411,59 +685,44 @@ class DatabaseOracle extends Database {
 	# 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
-	function replace( $table, $uniqueIndexes, $rows, $fname = 'Database::replace' ) {
-		$table = $this->tableName($table);
+	function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabaseOracle::replace' ) {
+		$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;
-				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 = array();
+				foreach ( $uniqueIndexes as $index )
+					$condsDelete[$index] = $row[$index];
+				if (count($condsDelete) > 0) {
+					$this->delete( $table, $condsDelete, $fname );
 				}
-				$sql .= ')';
-				$this->query( $sql, $fname );
+			}
+
+			if ( $sequenceData !== false && !isset( $row[$sequenceData['column']] ) ) {
+				$row[$sequenceData['column']] = $this->nextSequenceValue( $sequenceData['sequence'] );
 			}
 
 			# Now insert the row
-			$sql = "INSERT INTO $table (" . $this->makeList( array_keys( $row ), LIST_NAMES ) .') VALUES (' .
-				$this->makeList( $row, LIST_COMMA ) . ')';
-			$this->query($sql, $fname);
+			$this->insert( $table, $row, $fname );
 		}
 	}
 
 	# DELETE where the condition is a join
-	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = "Database::deleteJoin" ) {
+	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = "DatabaseOracle::deleteJoin" ) {
 		if ( !$conds ) {
-			throw new DBUnexpectedError($this,  'Database::deleteJoin() called with empty $conds' );
+			throw new DBUnexpectedError( $this,  'DatabaseOracle::deleteJoin() called with empty $conds' );
 		}
 
 		$delTable = $this->tableName( $delTable );
@@ -479,78 +738,80 @@ class DatabaseOracle extends Database {
 
 	# 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 lowPriorityOption() {
-		return '';
-	}
-
-	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";
+		}
+		return "SELECT * FROM ($sql) WHERE rownum >= (1 + $offset) AND rownum < (1 + $limit + $offset)";
 	}
 
-	/**
-	 * Returns an SQL expression for a simple conditional.
-	 * Uses CASE on Oracle
-	 *
-	 * @param $cond String: SQL expression which will result in a boolean value
-	 * @param $trueVal String: SQL expression to return if true
-	 * @param $falseVal String: SQL expression to return if false
-	 * @return String: SQL fragment
-	 */
-	function conditional( $cond, $trueVal, $falseVal ) {
-		return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
+
+	function unionQueries( $sqls, $all ) {
+		$glue = ' UNION ALL ';
+		return 'SELECT * ' . ( $all ? '':'/* UNION_UNIQUE */ ' ) . 'FROM (' . implode( $glue, $sqls ) . ')' ;
 	}
 
 	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' ) {
+		$temporary = $temporary ? 'TRUE' : 'FALSE';
+		$oldName = trim(strtoupper($oldName), '"');
+		$oldParts = explode('_', $oldName);
+		
+		$newName = trim(strtoupper($newName), '"');
+		$newParts = explode('_', $newName);
+
+		$oldPrefix = '';
+		$newPrefix = '';
+		for ($i = count($oldParts)-1; $i >= 0; $i--) {
+			if ($oldParts[$i] != $newParts[$i]) {
+				$oldPrefix = implode('_', $oldParts).'_';
+				$newPrefix = implode('_', $newParts).'_';
+				break;
+			}
+			unset($oldParts[$i]);
+			unset($newParts[$i]);
+		}
+		
+		$tabName = substr($oldName, strlen($oldPrefix));
+		
+		return $this->query( 'BEGIN DUPLICATE_TABLE(\'' . $tabName . '\', \'' . $oldPrefix . '\', \''.$newPrefix.'\', ' . $temporary . '); END;', $fname );
+	}
+
+	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 );
 		}
 	}
 
@@ -558,80 +819,252 @@ echo "error!\n";
 	 * @return string wikitext of a link to the server software's web site
 	 */
 	function getSoftwareLink() {
-		return "[http://www.oracle.com/ Oracle]";
+		return '[http://www.oracle.com/ Oracle]';
 	}
 
 	/**
 	 * @return string Version information from the database
 	 */
 	function getServerVersion() {
-		return oci_server_version($this->mConn);
+		return oci_server_version( $this->mConn );
 	}
 
 	/**
 	 * Query whether a given table exists (in the given schema, or the default mw one if not given)
 	 */
-	function tableExists($table) {
-		$etable= $this->addQuotes($table);
-		$SQL = "SELECT 1 FROM user_tables WHERE table_name='$etable'";
-		$res = $this->query($SQL);
-		$count = $res ? oci_num_rows($res) : 0;
-		if ($res)
-			$this->freeResult($res);
+	function tableExists( $table ) {
+		$SQL = "SELECT 1 FROM user_tables WHERE table_name='$table'";
+		$res = $this->doQuery( $SQL );
+		if ( $res ) {
+			$count = $res->numRows();
+			$res->free();
+		} else {
+			$count = 0;
+		}
 		return $count;
 	}
 
 	/**
-	 * Query whether a given column exists in the mediawiki schema
+	 * 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 Array $table
+	 * @param String $field
 	 */
-	function fieldExists( $table, $field ) {
-		return true; // XXX
+	private function fieldInfoMulti( $table, $field ) {
+		$tableWhere = '';
+		$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.'\'';
+		}
+
+		$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, $fieldInfoStmt );
+		if ($res->numRows() == 0 ) {
+			if (is_array($table)) {
+				foreach($table as &$singleTable) {
+					$this->mFieldInfoCache["$singleTable.$field"] = false;
+				}
+			} else {
+				$this->mFieldInfoCache["$table.$field"] = false;
+			}
+		} else {
+			$fieldInfoTemp = new ORAField( $res->fetchRow() );
+			$table = $fieldInfoTemp->tableName();
+			$this->mFieldInfoCache["$table.$field"] = $fieldInfoTemp;
+			return $fieldInfoTemp;
+		}
 	}
 
 	function fieldInfo( $table, $field ) {
-		return false; // XXX
+		if ( is_array( $table ) ) {
+			throw new DBUnexpectedError( $this, 'Database::fieldInfo called with table array!' );
+		}
+		return $this->fieldInfoMulti ($table, $field);
+	}
+
+	function fieldExists( $table, $field, $fname = 'DatabaseOracle::fieldExists' ) {
+		return (bool)$this->fieldInfo( $table, $field, $fname );
 	}
 
 	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;
 	}
 
-	function strencode($s) {
-		return str_replace("'", "''", $s);
+	/* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}'; */
+	function sourceStream( $fp, $lineCallback = false, $resultCallback = false ) {
+		$cmd = '';
+		$done = false;
+		$dollarquote = false;
+
+		$replacements = array();
+
+		while ( ! feof( $fp ) ) {
+			if ( $lineCallback ) {
+				call_user_func( $lineCallback );
+			}
+			$line = trim( fgets( $fp, 1024 ) );
+			$sl = strlen( $line ) - 1;
+
+			if ( $sl < 0 ) {
+				continue;
+			}
+			if ( '-' == $line { 0 } && '-' == $line { 1 } ) {
+				continue;
+			}
+
+			// Allow dollar quoting for function declarations
+			if ( substr( $line, 0, 8 ) == '/*$mw$*/' ) {
+				if ( $dollarquote ) {
+					$dollarquote = false;
+					$done = true;
+				} else {
+					$dollarquote = true;
+				}
+			} elseif ( !$dollarquote ) {
+				if ( ';' == $line { $sl } && ( $sl < 2 || ';' != $line { $sl - 1 } ) ) {
+					$done = true;
+					$line = substr( $line, 0, $sl );
+				}
+			}
+
+			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 ) ) {
+						$replacements[$defines[2]] = $defines[1];
+					}
+				} else {
+					foreach ( $replacements as $mwVar => $scVar ) {
+						$cmd = str_replace( '&' . $scVar . '.', '{$' . $mwVar . '}', $cmd );
+					}
+
+					$cmd = $this->replaceVars( $cmd );
+					$res = $this->query( $cmd, __METHOD__ );
+					if ( $resultCallback ) {
+						call_user_func( $resultCallback, $res, $this );
+					}
+
+					if ( false === $res ) {
+						$err = $this->lastError();
+						return "Query \"{$cmd}\" failed with error code \"$err\".\n";
+					}
+				}
+
+				$cmd = '';
+				$done = false;
+			}
+		}
+		return true;
 	}
 
-	function encodeBlob($b) {
-		return new ORABlob($b);
+	function setup_database() {
+		global $wgVersion, $wgDBmwschema, $wgDBts2schema, $wgDBport, $wgDBuser;
+
+		$res = $this->sourceFile( "../maintenance/ora/tables.sql" );
+		if ($res === true) {
+			print " done.</li>\n";
+		} else {
+			print " <b>FAILED</b></li>\n";
+			dieout( htmlspecialchars( $res ) );
+		}
+
+		// Avoid the non-standard "REPLACE INTO" syntax
+		echo "<li>Populating interwiki table</li>\n";
+		$f = fopen( "../maintenance/interwiki.sql", 'r' );
+		if ( $f == false ) {
+			dieout( "Could not find the interwiki.sql file" );
+		}
+
+		// do it like the postgres :D
+		$SQL = "INSERT INTO ".$this->tableName('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;
+			}
+			$this->query( "$SQL $matches[1],$matches[2])" );
+		}
+
+		echo "<li>Table interwiki successfully populated</li>\n";
 	}
-	function decodeBlob($b) {
-		return $b; //return $b->load();
+
+	function strencode( $s ) {
+		return str_replace( "'", "''", $s );
 	}
 
 	function addQuotes( $s ) {
-	global	$wgLang;
-		$s = $wgLang->checkTitleEncoding($s);
-		return "'" . $this->strencode($s) . "'";
+		global $wgLang;
+		if ( isset( $wgLang->mLoaded ) && $wgLang->mLoaded ) {
+			$s = $wgLang->checkTitleEncoding( $s );
+		}
+		return "'" . $this->strencode( $s ) . "'";
 	}
 
 	function quote_ident( $s ) {
 		return $s;
 	}
 
-	/* For now, does nothing */
-	function selectDB( $db ) {
-		return true;
+	function selectRow( $table, $vars, $conds, $fname = 'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) {
+		global $wgLang;
+
+		$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 . ')'] = $wgLang->checkTitleEncoding( $val );
+			} elseif ( $col_type == 'VARCHAR2' && !mb_check_encoding( $val ) ) {
+				$conds2[$col] = $wgLang->checkTitleEncoding( $val );
+			} else {
+				$conds2[$col] = $val;
+			}
+		}
+
+		return parent::selectRow( $table, $vars, $conds2, $fname, $options, $join_conds );
 	}
 
 	/**
@@ -655,18 +1088,18 @@ echo "error!\n";
 			}
 		}
 
-		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['LIMIT'])) {
-		//	$tailOpts .= $this->limitResult('', $options['LIMIT'],
-		//		isset($options['OFFSET']) ? $options['OFFSET']
-		//		: false);
+		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'] );
@@ -677,13 +1110,46 @@ echo "error!\n";
 		return array( $startOpts, $useIndex, $preLimitTail, $postLimitTail );
 	}
 
-	public function setTimeout( $timeout ) {
-		// @todo fixme no-op
+	public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) {
+		global $wgLang;
+
+		if ( $wgLang != null ) {
+			$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 . ')'] = $wgLang->checkTitleEncoding( $val );
+				} else {
+					if ( is_array( $val ) ) {
+						$conds2[$col] = $val;
+						foreach ( $conds2[$col] as &$val2 ) {
+							$val2 = $wgLang->checkTitleEncoding( $val2 );
+						}
+					} else {
+						$conds2[$col] = $wgLang->checkTitleEncoding( $val );
+					}
+				}
+			}
+
+			return parent::delete( $table, $conds2, $fname );
+		} else {
+			return parent::delete( $table, $conds, $fname );
+		}
 	}
 
-	function ping() {
-		wfDebug( "Function ping() not written for DatabaseOracle.php yet");
-		return true;
+	function bitNot( $field ) {
+		// expecting bit-fields smaller than 4bytes
+		return 'BITNOT(' . $bitField . ')';
+	}
+
+	function bitAnd( $fieldLeft, $fieldRight ) {
+		return 'BITAND(' . $fieldLeft . ', ' . $fieldRight . ')';
+	}
+
+	function bitOr( $fieldLeft, $fieldRight ) {
+		return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
 	}
 
 	/**
@@ -696,8 +1162,8 @@ echo "error!\n";
 		return 0;
 	}
 
-	function setFakeSlaveLag( $lag ) {}
-	function setFakeMaster( $enabled = true ) {}
+	function setFakeSlaveLag( $lag ) { }
+	function setFakeMaster( $enabled = true ) { }
 
 	function getDBname() {
 		return $this->mDBname;
@@ -706,19 +1172,28 @@ echo "error!\n";
 	function getServer() {
 		return $this->mServer;
 	}
-	
-	/** 
-	 * No-op lock functions
-	 */
-	public function lock( $lockName, $method ) {
-		return true;
-	}
-	public function unlock( $lockName, $method ) {
-		return true;
+
+	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 );
+			}
+		}
+
+		return parent::replaceVars( $ins );
 	}
-	
+
 	public function getSearchEngine() {
-		return "SearchOracle";
+		return 'SearchOracle';
 	}
-
 } // end DatabaseOracle class