From 3707fcc2f83e72a98031256cf1803af2fad069e7 Mon Sep 17 00:00:00 2001
From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Wed, 20 Jan 2010 16:19:08 +0000
Subject: [PATCH] Fixed as per Tim's comments on r60665: * fieldExists reduced
 to bool-cast output of fieldInfo * added negative cache (handled acordingly
 on fieldInfo usage) * uppercased parameters on entry. DB data is uppercased
 by default

---
 includes/db/DatabaseOracle.php | 71 ++++++++++++----------------------
 1 file changed, 25 insertions(+), 46 deletions(-)

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index b747f621ac..cf697ac841 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -476,7 +476,8 @@ class DatabaseOracle extends DatabaseBase {
 
 		$stmt = oci_parse( $this->mConn, $sql );
 		foreach ( $row as $col => &$val ) {
-			$col_type = $this->fieldInfo( $this->tableName( $table ), $col )->type();
+			$col_info = $this->fieldInfo( $this->tableName( $table ), $col );
+			$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
 
 			if ( $val === null ) {
 				// do nothing ... null was inserted in statement creation
@@ -837,11 +838,16 @@ 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' ) {
+		return (bool)$this->fieldInfo( $table, $field, $fname );
+	}
+
+	function fieldInfo( $table, $field ) {
 		$tableWhere = '';
+		$field = strtoupper($field);
 		if (is_array($table)) {
 			$tableWhere = 'IN (';
 			foreach($table as &$singleTable) {
-				$singleTable = trim( $singleTable, '"' );
+				$singleTable = strtoupper(trim( $singleTable, '"' ));
 				if (isset($this->mFieldInfoCache["$singleTable.$field"])) {
 					return $this->mFieldInfoCache["$singleTable.$field"];
 				}
@@ -849,63 +855,34 @@ class DatabaseOracle extends DatabaseBase {
 			}
 			$tableWhere = rtrim($tableWhere, ',').')';
 		} else {
-			$table = trim( $table, '"' );
+			$table = strtoupper(trim( $table, '"' ));
 			if (isset($this->mFieldInfoCache["$table.$field"])) {
 				return $this->mFieldInfoCache["$table.$field"];
 			}
-			$tableWhere = '= upper(\''.$table.'\')';
+			$tableWhere = '= \''.$table.'\'';
 		}
-		
-		$fieldInfoStmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name '.$tableWhere.' and column_name = UPPER(\''.$field.'\')' );
 
+		$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) {
-			$fieldInfoTemp = new ORAField( $res->fetchRow() );
-			$table = $fieldInfoTemp->tableName();
-			$this->mFieldInfoCache["$table.$field"] = $fieldInfoTemp;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	function fieldInfo( $table, $field ) {
-		$tableWhere = '';
-		if (is_array($table)) {
-			$tableWhere = 'IN (';
-			foreach($table as &$singleTable) {
-				$singleTable = trim( $singleTable, '"' );
-				if (isset($this->mFieldInfoCache["$singleTable.$field"])) {
-					return $this->mFieldInfoCache["$singleTable.$field"];
+		if ($res->numRows() == 0 ) {
+			if (is_array($table)) {
+				foreach($table as &$singleTable) {
+					$this->mFieldInfoCache["$singleTable.$field"] = false;
 				}
-				$tableWhere .= '\''.$singleTable.'\',';
+			} else {
+				$this->mFieldInfoCache["$table.$field"] = false;
 			}
-			$tableWhere = rtrim($tableWhere, ',').')';
 		} else {
-			$table = trim( $table, '"' );
-			if (isset($this->mFieldInfoCache["$table.$field"])) {
-				return $this->mFieldInfoCache["$table.$field"];
-			}
-			$tableWhere = '= upper(\''.$table.'\')';
-		}
-		
-		$fieldInfoStmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name '.$tableWhere.' and column_name = UPPER(\''.$field.'\')' );
-
-		if ( oci_execute( $fieldInfoStmt, OCI_DEFAULT ) === false ) {
-			$e = oci_error( $fieldInfoStmt );
-			$this->reportQueryError( $e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__ );
-			return false;
+			$fieldInfoTemp = new ORAField( $res->fetchRow() );
+			$table = $fieldInfoTemp->tableName();
+			$this->mFieldInfoCache["$table.$field"] = $fieldInfoTemp;
+			return $fieldInfoTemp;
 		}
-		$res = new ORAResult( $this, $fieldInfoStmt );
-		$fieldInfoTemp = new ORAField( $res->fetchRow() );
-		$table = $fieldInfoTemp->tableName();
-		$this->mFieldInfoCache["$table.$field"] = $fieldInfoTemp;
-		return $fieldInfoTemp;
 	}
 
 	function begin( $fname = '' ) {
@@ -1047,7 +1024,8 @@ class DatabaseOracle extends DatabaseBase {
 		$conds2 = array();
 		$conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds;
 		foreach ( $conds as $col => $val ) {
-			$col_type = $this->fieldInfo( $this->tableName( $table ), $col )->type();
+			$col_info = $this->fieldInfo( $this->tableName( $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 ) ) {
@@ -1118,7 +1096,8 @@ class DatabaseOracle extends DatabaseBase {
 			$conds2 = array();
 			$conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds;
 			foreach ( $conds as $col => $val ) {
-				$col_type = $this->fieldInfo( $this->tableName( $table ), $col )->type();
+				$col_info = $this->fieldInfo( $this->tableName( $table ), $col );
+				$col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
 				if ( $col_type == 'CLOB' ) {
 					$conds2['TO_CHAR(' . $col . ')'] = $wgLang->checkTitleEncoding( $val );
 				} else {
-- 
2.20.1