From d5c5375ec4032e3cfcc63ba2e8ea40afc4ed034e Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Thu, 10 Dec 2009 23:22:34 +0000
Subject: [PATCH] stylize.php on DatabaseOracle.php

Please follow <http://www.mediawiki.org/wiki/Manual:Coding_conventions>
so that code is easier to read.  (For anyone whose blames are getting
messed up by whitespace changes, use svn blame -x -w, or git blame -w,
to ignore them.)
---
 includes/db/DatabaseOracle.php | 552 ++++++++++++++++-----------------
 1 file changed, 276 insertions(+), 276 deletions(-)

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index b35035b1e2..0eed6510f3 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;
 	}
 
@@ -33,33 +33,33 @@ class ORAResult {
 	private $nrows;
 
 	private $unique;
-	private function array_unique_md($array_in) {  
+	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;  
+		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;  
+		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'], '', __FUNCTION__ );
 			return;
 		}
 
-		if ($unique) {
-			$this->rows = $this->array_unique_md($this->rows);
-			$this->nrows = count($this->rows);
+		if ( $unique ) {
+			$this->rows = $this->array_unique_md( $this->rows );
+			$this->nrows = count( $this->rows );
 		}
 
 		$this->cursor = 0;
@@ -67,11 +67,11 @@ class ORAResult {
 	}
 
 	public function free() {
-		oci_free_statement($this->stmt);
+		oci_free_statement( $this->stmt );
 	}
 
-	public function seek($row) {
-		$this->cursor = min($row, $this->nrows);
+	public function seek( $row ) {
+		$this->cursor = min( $row, $this->nrows );
 	}
 
 	public function numRows() {
@@ -79,16 +79,16 @@ class ORAResult {
 	}
 
 	public function numFields() {
-		return oci_num_fields($this->stmt);
+		return oci_num_fields( $this->stmt );
 	}
 
 	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 = strtolower( oci_field_name( $this->stmt, $k + 1 ) );
 			$ret->$lc = $v;
 		}
 
@@ -96,13 +96,13 @@ 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 = strtolower( oci_field_name( $this->stmt, $k + 1 ) );
 			$ret[$lc] = $v;
 			$ret[$k] = $v;
 		}
@@ -118,16 +118,16 @@ class ORAField {
 	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'];
 	}
  
@@ -180,12 +180,12 @@ class DatabaseOracle extends DatabaseBase {
 
 	var $defaultCharset = 'AL32UTF8';
 
-	function DatabaseOracle($server = false, $user = false, $password = false, $dbName = false,
+	function DatabaseOracle( $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));
+		$tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper( $tablePrefix );
+		parent::__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix );
+		wfRunHooks( 'DatabaseOraclePostInit', array( &$this ) );
 	}
 
 	function cascadingDeletes() {
@@ -224,7 +224,7 @@ class DatabaseOracle extends DatabaseBase {
 			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");
+		// putenv("NLS_LANG=AMERICAN_AMERICA.AL32UTF8");
 
 		$this->close();
 		$this->mServer = $server;
@@ -232,28 +232,28 @@ class DatabaseOracle extends DatabaseBase {
 		$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;
 		}
 
 		$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);
+			$this->mConn = oci_new_connect( $user, $password, $dbName, $this->defaultCharset, $session_mode );
 		else
-			$this->mConn = oci_connect($user, $password, $dbName, $this->defaultCharset, $session_mode);
+			$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\'');
+		# 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;
 	}
 
@@ -274,58 +274,58 @@ 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\n$sql");
+	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
-		if(!defined('MEDIAWIKI_INSTALL'))
-			$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
-		$olderr = error_reporting(E_ERROR);
-		$explain_id = date('dmYHis');
-		error_reporting($olderr);
-
-		$sql = preg_replace('/^EXPLAIN /', 'EXPLAIN PLAN SET STATEMENT_ID = \''.$explain_id.'\' FOR', $sql, 1, $explain_count);
+		$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
+		$olderr = error_reporting( E_ERROR );
+		$explain_id = date( 'dmYHis' );
+		error_reporting( $olderr );
+
+		$sql = preg_replace( '/^EXPLAIN /', 'EXPLAIN PLAN SET STATEMENT_ID = \'' . $explain_id . '\' FOR', $sql, 1, $explain_count );
 			
 		
-		$olderr = error_reporting(E_ERROR);
+		$olderr = error_reporting( E_ERROR );
 		
-		if (($this->mLastResult = $stmt = oci_parse($this->mConn, $sql)) === false) {
-			$e = oci_error($this->mConn);
-			$this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+		if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
+			$e = oci_error( $this->mConn );
+			$this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ );
 		}
 
-		$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__);
+		$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__ );
 		}
-		error_reporting($olderr);
+		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);
+		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) {
+	function freeResult( $res ) {
 		if ( $res instanceof ORAResult ) {
 			$res->free();
 		} else {
@@ -333,7 +333,7 @@ class DatabaseOracle extends DatabaseBase {
 		}
 	}
 
-	function fetchObject($res) {
+	function fetchObject( $res ) {
 		if ( $res instanceof ORAResult ) {
 			return $res->numRows();
 		} else {
@@ -341,7 +341,7 @@ class DatabaseOracle extends DatabaseBase {
 		}
 	}
 
-	function fetchRow($res) {
+	function fetchRow( $res ) {
 		if ( $res instanceof ORAResult ) {
 			return $res->fetchRow();
 		} else {
@@ -349,7 +349,7 @@ class DatabaseOracle extends DatabaseBase {
 		}
 	}
 
-	function numRows($res) {
+	function numRows( $res ) {
 		if ( $res instanceof ORAResult ) {
 			return $res->numRows();
 		} else {
@@ -357,7 +357,7 @@ class DatabaseOracle extends DatabaseBase {
 		}
 	}
 
-	function numFields($res) {
+	function numFields( $res ) {
 		if ( $res instanceof ORAResult ) {
 			return $res->numFields();
 		} else {
@@ -365,8 +365,8 @@ class DatabaseOracle extends DatabaseBase {
 		}
 	}
 
-	function fieldName($stmt, $n) {
-		return oci_field_name($stmt, $n);
+	function fieldName( $stmt, $n ) {
+		return oci_field_name( $stmt, $n );
 	}
 
 	/**
@@ -376,27 +376,27 @@ 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);
+			$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);
+			$e = oci_error( $this->mConn );
 		return $e['code'];
 	}
 
@@ -412,7 +412,7 @@ class DatabaseOracle extends DatabaseBase {
 		return false;
 	}
 
-	function indexUnique ($table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
+	function indexUnique ( $table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
 		return false;
 	}
 
@@ -420,125 +420,125 @@ class DatabaseOracle extends DatabaseBase {
 		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) {
+	function insertOneRow( $table, $row, $fname ) {
 		global $wgLang;
 
 		// "INSERT INTO tables (a, b, c)"
-		$sql = "INSERT INTO " . $this->tableName($table) . " (" . join(',', array_keys($row)) . ')';
+		$sql = "INSERT INTO " . $this->tableName( $table ) . " (" . join( ',', array_keys( $row ) ) . ')';
 		$sql .= " VALUES (";
 
 		// for each value, append ":key"
 		$first = true;
-		foreach ($row as $col => $val) {
-			if ($first)
-				$sql .= $val !== NULL ? ':'.$col : 'NULL';
+		foreach ( $row as $col => $val ) {
+			if ( $first )
+				$sql .= $val !== NULL ? ':' . $col : 'NULL';
 			else
-				$sql .= $val !== NULL ? ', :'.$col : ', NULL';
+				$sql .= $val !== NULL ? ', :' . $col : ', NULL';
 			
 			$first = false;
 		}
 		$sql .= ')';
 
 		
-		$stmt = oci_parse($this->mConn, $sql);
-		foreach ($row as $col => &$val) {
-			$col_type=$this->fieldInfo($this->tableName($table), $col)->type();
+		$stmt = oci_parse( $this->mConn, $sql );
+		foreach ( $row as $col => &$val ) {
+			$col_type = $this->fieldInfo( $this->tableName( $table ), $col )->type();
 			
-			if ($val === NULL) {
+			if ( $val === NULL ) {
 				// do nothing ... null was inserted in statement creation
-			} elseif ($col_type != 'BLOB' && $col_type != 'CLOB') {
-				if (is_object($val))
+			} 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') 
+				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__);
+				$val = ( $wgLang != null ) ? $wgLang->checkTitleEncoding( $val ) : $val;
+				if ( oci_bind_by_name( $stmt, ":$col", $val ) === false )
+					$this->reportQueryError( $this->lastErrno(), $this->lastError(), $sql, __METHOD__ );
 			} 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 ($col_type == 'BLOB') { //is_object($val)) {
-					$lob[$col]->writeTemporary($val); //->getData());
-					oci_bind_by_name($stmt, ":$col", $lob[$col], -1, SQLT_BLOB);
+				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);
+					$lob[$col]->writeTemporary( $val );
+					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);
+		$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__);
+			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);
+				$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) {
+		if ( isset( $lob ) ) {
+			foreach ( $lob as $lob_i => $lob_v ) {
 				$lob_v->free();
 			}
 		}
 		
-		if (!$this->mTrxLevel)
-			oci_commit($this->mConn);
+		if ( !$this->mTrxLevel )
+			oci_commit( $this->mConn );
 		
-		oci_free_statement($stmt);
+		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'].'\')';
+		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 $key=>&$val)
-			$val=$val.' field'.($i++);
+		$i = 0;
+		foreach ( $varMap as $key => &$val )
+			$val = $val . ' field' . ( $i++ );
 		
 		$sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
 			" SELECT $startOpts " . implode( ',', $varMap ) .
@@ -548,12 +548,12 @@ 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;
@@ -577,18 +577,18 @@ class DatabaseOracle extends DatabaseBase {
 			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 ( $name[0] == '"' && substr( $name, - 1, 1 ) == '"' ) return $name;
 
-		if( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) 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;
+		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 ) ) $table = ( $table[0] == '`' ? $table : "`{$table}`" );
 		
-		if( !isset( $database ) 
+		if ( !isset( $database )
 		 && isset( $wgSharedDB )
 		 && $table[0] != '"'
 		 && isset( $wgSharedTables )
@@ -598,37 +598,37 @@ class DatabaseOracle extends DatabaseBase {
 			$prefix   = isset( $wgSharedPrefix ) ? $wgSharedPrefix : $prefix;
 		}
 		
-		if( isset($database) ) $database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
+		if ( isset( $database ) ) $database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
 		$table = ( $table[0] == '"' ? $table : "\"{$prefix}{$table}\"" );
 		
-		$tableName = ( isset($database) ? "{$database}.{$table}" : "{$table}" );
+		$tableName = ( isset( $database ) ? "{$database}.{$table}" : "{$table}" );
 		
-		return strtoupper($tableName);
+		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;
 	}
 
 	/**
 	 * Return sequence_name if table has a sequence
 	 */
-	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'");
+	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]);
+			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;
+		return ( isset( $this->sequenceData[$table] ) ) ? $this->sequenceData[$table] : false;
 	}
 	
 
@@ -642,26 +642,26 @@ class DatabaseOracle extends DatabaseBase {
 	# 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 = '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 );
 		}
 
-		$sequenceData = $this->getSequenceData($table);
+		$sequenceData = $this->getSequenceData( $table );
 
-		foreach( $rows as $row ) {
+		foreach ( $rows as $row ) {
 			# Delete rows which collide
 			if ( $uniqueIndexes ) {
 				$condsDelete = array();
 				foreach ( $uniqueIndexes as $index )
 					$condsDelete[$index] = $row[$index];
-				$this->delete( $table, $condsDelete, $fname);
+				$this->delete( $table, $condsDelete, $fname );
 /*
 				$sql = "DELETE FROM $table WHERE ";
 				$first = true;
@@ -692,8 +692,8 @@ class DatabaseOracle extends DatabaseBase {
 */
 			}
 
-			if ($sequenceData !== false && !isset($row[$sequenceData['column']]))
-				$row[$sequenceData['column']] = $this->nextSequenceValue($sequenceData['sequence']);
+			if ( $sequenceData !== false && !isset( $row[$sequenceData['column']] ) )
+				$row[$sequenceData['column']] = $this->nextSequenceValue( $sequenceData['sequence'] );
 
 			# Now insert the row
 			$this->insert( $table, $row, $fname );
@@ -703,7 +703,7 @@ class DatabaseOracle extends DatabaseBase {
 	# DELETE where the condition is a join
 	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 );
@@ -724,27 +724,27 @@ class DatabaseOracle extends DatabaseBase {
 			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;
+		$res = $this->query( $sql );
+		$row = $this->fetchObject( $res );
+		if ( $row->ftype == "varchar" ) {
+			$size = $row->size - 4;
 		} else {
-			$size=$row->size;
+			$size = $row->size;
 		}
 		$this->freeResult( $res );
 		return $size;
 	}
 
-	function limitResult( $sql, $limit, $offset=false ) {
-		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 unionQueries($sqls, $all) {
+	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 ) . ')' ;
 	}
 
 	function wasDeadlock() {
@@ -754,28 +754,28 @@ class DatabaseOracle extends DatabaseBase {
 
 	function duplicateTableStructure( $oldName, $newName, $temporary = false, $fname = 'DatabaseOracle::duplicateTableStructure' ) {
 		$temporary = $temporary ? 'TRUE' : 'FALSE';
-		return $this->query( 'BEGIN DUPLICATE_TABLE(\''.$oldName.'\', \''.$newName.'\', '.$temporary.'); END;', $fname );
+		return $this->query( 'BEGIN DUPLICATE_TABLE(\'' . $oldName . '\', \'' . $newName . '\', ' . $temporary . '); END;', $fname );
 	}
 
-	function timestamp($ts = 0) {
-		return wfTimestamp(TS_ORACLE, $ts);
+	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) {
-			wfDebug("SQL ERROR (ignored): $error\n");
+		if ( $ignore || $tempIgnore ) {
+			wfDebug( "SQL ERROR (ignored): $error\n" );
 			$this->ignoreErrors( $ignore );
 		}
 		else {
@@ -783,7 +783,7 @@ class DatabaseOracle extends DatabaseBase {
 				"Query: $sql\n" .
 				"Function: $fname\n" .
 				"Error: $errno $error\n";
-			throw new DBUnexpectedError($this, $message);
+			throw new DBUnexpectedError( $this, $message );
 		}
 	}
 
@@ -798,16 +798,16 @@ class DatabaseOracle extends DatabaseBase {
 	 * @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) {
+	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 {
@@ -821,36 +821,36 @@ class DatabaseOracle extends DatabaseBase {
 	 * based on prebuilt table to simulate MySQL field info and keep query speed minimal
 	 */
 	function fieldExists( $table, $field, $fname = 'DatabaseOracle::fieldExists' ) {
-		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)');
+		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);
+		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__);
+		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;
 		}
-		$res = new ORAResult($this,$this->fieldInfo_stmt);
+		$res = new ORAResult( $this, $this->fieldInfo_stmt );
 		return $res->numRows() != 0;
 	}
 
 	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)');
+		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)' );
 
-		$table = trim($table, '"');
-		oci_bind_by_name($this->fieldInfo_stmt, ':tab', $table);
-		oci_bind_by_name($this->fieldInfo_stmt, ':col', $field);
+		$table = trim( $table, '"' );
+		oci_bind_by_name( $this->fieldInfo_stmt, ':tab', $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__);
+		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;
 		}
-		$res = new ORAResult($this,$this->fieldInfo_stmt);
-		return new ORAField($res->fetchRow());
+		$res = new ORAResult( $this, $this->fieldInfo_stmt );
+		return new ORAField( $res->fetchRow() );
 	}
 
 	function begin( $fname = '' ) {
@@ -860,12 +860,12 @@ class DatabaseOracle extends DatabaseBase {
 		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;
 	}
 
@@ -885,11 +885,11 @@ class DatabaseOracle extends DatabaseBase {
 			$sl = strlen( $line ) - 1;
 
 			if ( $sl < 0 ) { continue; }
-			if ( '-' == $line{0} && '-' == $line{1} ) { 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;
 					$done = true;
 				}
@@ -897,8 +897,8 @@ class DatabaseOracle extends DatabaseBase {
 					$dollarquote = true;
 				}
 			}
-			else if (!$dollarquote) {
-				if ( ';' == $line{$sl} && ($sl < 2 || ';' != $line{$sl - 1})) {
+			else if ( !$dollarquote ) {
+				if ( ';' == $line { $sl } && ( $sl < 2 || ';' != $line { $sl - 1 } ) ) {
 					$done = true;
 					$line = substr( $line, 0, $sl );
 				}
@@ -908,14 +908,14 @@ class DatabaseOracle extends DatabaseBase {
 			$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 );
@@ -946,26 +946,26 @@ class DatabaseOracle extends DatabaseBase {
 		// 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>");
+		if ( $f == false ) {
+			dieout( "<li>Could not find the interwiki.sql file</li>" );
 		}
 		
-		//do it like the postgres :D
+		// do it like the postgres :D
 		$SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES ";
 		while ( ! feof( $f ) ) {
-			$line = fgets($f,1024);
+			$line = fgets( $f, 1024 );
 			$matches = array();
-			if (!preg_match('/^\s*(\(.+?),(\d)\)/', $line, $matches)) {
+			if ( !preg_match( '/^\s*(\(.+?),(\d)\)/', $line, $matches ) ) {
 				continue;
 			}
-			$this->query("$SQL $matches[1],$matches[2])");
+			$this->query( "$SQL $matches[1],$matches[2])" );
 		}
 
 		echo "<li>Table interwiki successfully populated</li>\n";
 	}
 
-	function strencode($s) {
-		return str_replace("'", "''", $s);
+	function strencode( $s ) {
+		return str_replace( "'", "''", $s );
 	}
 
 /*
@@ -978,9 +978,9 @@ class DatabaseOracle extends DatabaseBase {
 */
 	function addQuotes( $s ) {
 		global $wgLang;
-		if (isset($wgLang->mLoaded) && $wgLang->mLoaded)
-			$s = $wgLang->checkTitleEncoding($s);
-		return "'" . $this->strencode($s) . "'";
+		if ( isset( $wgLang->mLoaded ) && $wgLang->mLoaded )
+			$s = $wgLang->checkTitleEncoding( $s );
+		return "'" . $this->strencode( $s ) . "'";
 	}
 
 	function quote_ident( $s ) {
@@ -991,24 +991,24 @@ class DatabaseOracle extends DatabaseBase {
 		global $wgLang;
 
 		$conds2 = array();
-		foreach($conds as $col=>$val) {
-			$col_type=$this->fieldInfo($this->tableName($table), $col)->type();
-			if ($col_type == 'CLOB')
-				$conds2['TO_CHAR('.$col.')'] = $wgLang->checkTitleEncoding($val);
-			elseif ($col_type == 'VARCHAR2' && !mb_check_encoding($val)) {
-				$conds2[$col] = $wgLang->checkTitleEncoding($val);
+		foreach ( $conds as $col => $val ) {
+			$col_type = $this->fieldInfo( $this->tableName( $table ), $col )->type();
+			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;
 			}
 		}
 
-		if (is_array($table)) 
-			foreach ($table as $tab)
-				$tab = $this->tableName($tab);
+		if ( is_array( $table ) )
+			foreach ( $table as $tab )
+				$tab = $this->tableName( $tab );
 		else
-			$table = $this->tableName($table);
+			$table = $this->tableName( $table );
 
-		return parent::selectRow($table, $vars, $conds2, $fname, $options, $join_conds);
+		return parent::selectRow( $table, $vars, $conds2, $fname, $options, $join_conds );
 	}
 
 	/**
@@ -1035,8 +1035,8 @@ 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( $noKeyOptions['FOR UPDATE'] ) ) $tailOpts .= ' FOR UPDATE';
-		#if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) $tailOpts .= ' LOCK IN SHARE MODE';
+		# 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'] ) ) {
@@ -1051,19 +1051,19 @@ class DatabaseOracle extends DatabaseBase {
 	public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) {
 		global $wgLang;
 
-		if ($wgLang != null) {
+		if ( $wgLang != null ) {
 			$conds2 = array();
-			foreach($conds as $col=>$val) {
-				$col_type=$this->fieldInfo($this->tableName($table), $col)->type();
-				if ($col_type == 'CLOB')
-					$conds2['TO_CHAR('.$col.')'] = $wgLang->checkTitleEncoding($val);
+			foreach ( $conds as $col => $val ) {
+				$col_type = $this->fieldInfo( $this->tableName( $table ), $col )->type();
+				if ( $col_type == 'CLOB' )
+					$conds2['TO_CHAR(' . $col . ')'] = $wgLang->checkTitleEncoding( $val );
 				else
-					if (is_array($val)) {
+					if ( is_array( $val ) ) {
 						$conds2[$col] = $val;
-						foreach($conds2[$col] as &$val2)
-							$val2 = $wgLang->checkTitleEncoding($val2);
+						foreach ( $conds2[$col] as &$val2 )
+							$val2 = $wgLang->checkTitleEncoding( $val2 );
 					} else {
-						$conds2[$col] = $wgLang->checkTitleEncoding($val);
+						$conds2[$col] = $wgLang->checkTitleEncoding( $val );
 					}
 			}
 		
@@ -1071,17 +1071,17 @@ class DatabaseOracle extends DatabaseBase {
 		} else return parent::delete( $table, $conds, $fname );
 	}
 
-	function bitNot($field) {
-		//expecting bit-fields smaller than 4bytes
-		return 'BITNOT('.$bitField.')';
+	function bitNot( $field ) {
+		// expecting bit-fields smaller than 4bytes
+		return 'BITNOT(' . $bitField . ')';
 	}
 
-	function bitAnd($fieldLeft, $fieldRight) {
-		return 'BITAND('.$fieldLeft.', '.$fieldRight.')';
+	function bitAnd( $fieldLeft, $fieldRight ) {
+		return 'BITAND(' . $fieldLeft . ', ' . $fieldRight . ')';
 	}
 
-	function bitOr($fieldLeft, $fieldRight) {
-		return 'BITOR('.$fieldLeft.', '.$fieldRight.')';
+	function bitOr( $fieldLeft, $fieldRight ) {
+		return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
 	}
 
 	/**
@@ -1094,8 +1094,8 @@ class DatabaseOracle extends DatabaseBase {
 		return 0;
 	}
 
-	function setFakeSlaveLag( $lag ) {}
-	function setFakeMaster( $enabled = true ) {}
+	function setFakeSlaveLag( $lag ) { }
+	function setFakeMaster( $enabled = true ) { }
 
 	function getDBname() {
 		return $this->mDBname;
@@ -1106,15 +1106,15 @@ class DatabaseOracle extends DatabaseBase {
 	}
 	
 	public function replaceVars( $ins ) {
-		$varnames = array('wgDBprefix');
-		if ($this->mFlags & DBO_SYSDBA) {
+		$varnames = array( 'wgDBprefix' );
+		if ( $this->mFlags & DBO_SYSDBA ) {
 			$varnames[] = 'wgDBOracleDefTS';
 			$varnames[] = 'wgDBOracleTempTS';
 		}
 
 		// Ordinary variables
 		foreach ( $varnames as $var ) {
-			if( isset( $GLOBALS[$var] ) ) {
+			if ( isset( $GLOBALS[$var] ) ) {
 				$val = addslashes( $GLOBALS[$var] ); // FIXME: safety check?
 				$ins = str_replace( '{$' . $var . '}', $val, $ins );
 				$ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
@@ -1122,7 +1122,7 @@ class DatabaseOracle extends DatabaseBase {
 			}
 		}
 
-		return parent::replaceVars($ins);
+		return parent::replaceVars( $ins );
 	}
 
 	public function getSearchEngine() {
-- 
2.20.1