| Index: branches/REL1_17/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -704,6 +704,11 @@ |
| 705 | 705 | return strtoupper( $tableName ); |
| 706 | 706 | } |
| 707 | 707 | |
| | 708 | + function tableNameInternal( $name ) { |
| | 709 | + $name = $this->tableName( $name ); |
| | 710 | + return preg_replace( '/.*\."(.*)"/', '$1', $name); |
| | 711 | + } |
| | 712 | + |
| 708 | 713 | /** |
| 709 | 714 | * Return the next in a sequence, save the value for retrieval via insertId() |
| 710 | 715 | */ |
| — | — | @@ -955,7 +960,7 @@ |
| 956 | 961 | private function fieldInfoMulti( $table, $field ) { |
| 957 | 962 | $field = strtoupper( $field ); |
| 958 | 963 | if ( is_array( $table ) ) { |
| 959 | | - $table = array_map( array( &$this, 'tableName' ), $table ); |
| | 964 | + $table = array_map( array( &$this, 'tableNameInternal' ), $table ); |
| 960 | 965 | $tableWhere = 'IN ('; |
| 961 | 966 | foreach( $table as &$singleTable ) { |
| 962 | 967 | $singleTable = strtoupper( trim( $singleTable, '"' ) ); |
| — | — | @@ -966,7 +971,7 @@ |
| 967 | 972 | } |
| 968 | 973 | $tableWhere = rtrim( $tableWhere, ',' ) . ')'; |
| 969 | 974 | } else { |
| 970 | | - $table = strtoupper( trim( $this->tableName( $table ), '"' ) ); |
| | 975 | + $table = strtoupper( trim( $this->tableNameInternal( $table ), '"' ) ); |
| 971 | 976 | if ( isset( $this->mFieldInfoCache["$table.$field"] ) ) { |
| 972 | 977 | return $this->mFieldInfoCache["$table.$field"]; |
| 973 | 978 | } |