| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -808,7 +808,7 @@ |
| 809 | 809 | # Returns the size of a text field, or -1 for "unlimited" |
| 810 | 810 | function textFieldSize( $table, $field ) { |
| 811 | 811 | $fieldInfoData = $this->fieldInfo( $table, $field); |
| 812 | | - if ( $fieldInfoData->type == 'varchar' ) { |
| | 812 | + if ( $fieldInfoData->type() == 'varchar' ) { |
| 813 | 813 | $size = $row->size - 4; |
| 814 | 814 | } else { |
| 815 | 815 | $size = $row->size; |
| — | — | @@ -928,6 +928,7 @@ |
| 929 | 929 | * |
| 930 | 930 | * @param $table Array |
| 931 | 931 | * @param $field String |
| | 932 | + * @return ORAField |
| 932 | 933 | */ |
| 933 | 934 | private function fieldInfoMulti( $table, $field ) { |
| 934 | 935 | $field = strtoupper( $field ); |
| — | — | @@ -975,6 +976,12 @@ |
| 976 | 977 | return $fieldInfoTemp; |
| 977 | 978 | } |
| 978 | 979 | |
| | 980 | + /** |
| | 981 | + * @throws DBUnexpectedError |
| | 982 | + * @param $table |
| | 983 | + * @param $field |
| | 984 | + * @return ORAField |
| | 985 | + */ |
| 979 | 986 | function fieldInfo( $table, $field ) { |
| 980 | 987 | if ( is_array( $table ) ) { |
| 981 | 988 | throw new DBUnexpectedError( $this, 'DatabaseOracle::fieldInfo called with table array!' ); |