| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -734,7 +734,6 @@ |
| 735 | 735 | |
| 736 | 736 | # Returns the size of a text field, or -1 for "unlimited" |
| 737 | 737 | function textFieldSize( $table, $field ) { |
| 738 | | - $table = $this->tableName( $table ); |
| 739 | 738 | $fieldInfoData = $this->fieldInfo( $table, $field); |
| 740 | 739 | if ( $fieldInfoData->type == "varchar" ) { |
| 741 | 740 | $size = $row->size - 4; |
| — | — | @@ -834,6 +833,7 @@ |
| 835 | 834 | $tableWhere = ''; |
| 836 | 835 | $field = strtoupper($field); |
| 837 | 836 | if (is_array($table)) { |
| | 837 | + $table = array_map( array( &$this, 'tableName' ), $table ); |
| 838 | 838 | $tableWhere = 'IN ('; |
| 839 | 839 | foreach($table as &$singleTable) { |
| 840 | 840 | $singleTable = strtoupper(trim( $singleTable, '"' )); |
| — | — | @@ -844,7 +844,7 @@ |
| 845 | 845 | } |
| 846 | 846 | $tableWhere = rtrim($tableWhere, ',').')'; |
| 847 | 847 | } else { |
| 848 | | - $table = strtoupper(trim( $table, '"' )); |
| | 848 | + $table = strtoupper(trim( $this->tableName($table), '"' )); |
| 849 | 849 | if (isset($this->mFieldInfoCache["$table.$field"])) { |
| 850 | 850 | return $this->mFieldInfoCache["$table.$field"]; |
| 851 | 851 | } |
| — | — | @@ -1021,11 +1021,6 @@ |
| 1022 | 1022 | function selectRow( $table, $vars, $conds, $fname = 'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) { |
| 1023 | 1023 | global $wgLang; |
| 1024 | 1024 | |
| 1025 | | - if (is_array($table)) { |
| 1026 | | - $table = array_map( array( &$this, 'tableName' ), $table ); |
| 1027 | | - } |
| 1028 | | - $table = $this->tableName($table); |
| 1029 | | - |
| 1030 | 1025 | $conds2 = array(); |
| 1031 | 1026 | $conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds; |
| 1032 | 1027 | foreach ( $conds as $col => $val ) { |
| — | — | @@ -1089,10 +1084,6 @@ |
| 1090 | 1085 | public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) { |
| 1091 | 1086 | global $wgLang; |
| 1092 | 1087 | |
| 1093 | | - if (is_array($table)) { |
| 1094 | | - $table = array_map( array( &$this, 'tableName' ), $table ); |
| 1095 | | - } |
| 1096 | | - |
| 1097 | 1088 | if ( $wgLang != null ) { |
| 1098 | 1089 | $conds2 = array(); |
| 1099 | 1090 | $conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds; |