| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -662,6 +662,10 @@ |
| 663 | 663 | return parent::tableName( strtoupper( $name ), $quoted ); |
| 664 | 664 | } |
| 665 | 665 | |
| | 666 | + function tableNameInternal( $name ) { |
| | 667 | + $name = $this->tableName( $name ); |
| | 668 | + return preg_replace( '/.*\.(.*)/', '$1', $name); |
| | 669 | + } |
| 666 | 670 | /** |
| 667 | 671 | * Return the next in a sequence, save the value for retrieval via insertId() |
| 668 | 672 | */ |
| — | — | @@ -913,7 +917,7 @@ |
| 914 | 918 | private function fieldInfoMulti( $table, $field ) { |
| 915 | 919 | $field = strtoupper( $field ); |
| 916 | 920 | if ( is_array( $table ) ) { |
| 917 | | - $table = array_map( array( &$this, 'tableName' ), $table ); |
| | 921 | + $table = array_map( array( &$this, 'tableNameInternal' ), $table ); |
| 918 | 922 | $tableWhere = 'IN ('; |
| 919 | 923 | foreach( $table as &$singleTable ) { |
| 920 | 924 | $singleTable = $this->removeIdentifierQuotes($singleTable); |
| — | — | @@ -924,7 +928,7 @@ |
| 925 | 929 | } |
| 926 | 930 | $tableWhere = rtrim( $tableWhere, ',' ) . ')'; |
| 927 | 931 | } else { |
| 928 | | - $table = $this->removeIdentifierQuotes($table); |
| | 932 | + $table = $this->removeIdentifierQuotes( $this->tableNameInternal( $table ) ); |
| 929 | 933 | if ( isset( $this->mFieldInfoCache["$table.$field"] ) ) { |
| 930 | 934 | return $this->mFieldInfoCache["$table.$field"]; |
| 931 | 935 | } |