Index: trunk/phase3/includes/db/DatabaseOracle.php |
— | — | @@ -855,7 +855,7 @@ |
856 | 856 | function fieldExists( $table, $field, $fname = 'DatabaseOracle::fieldExists' ) { |
857 | 857 | $table = trim( $table, '"' ); |
858 | 858 | |
859 | | - if (isset($this->mFileInfoCache[$table.'.'.$field])) { |
| 859 | + if (isset($this->mFieldInfoCache[$table.'.'.$field])) { |
860 | 860 | return true; |
861 | 861 | } elseif ( !isset( $this->fieldInfo_stmt ) ) { |
862 | 862 | $this->fieldInfo_stmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)' ); |
— | — | @@ -871,7 +871,7 @@ |
872 | 872 | } |
873 | 873 | $res = new ORAResult( $this, $this->fieldInfo_stmt ); |
874 | 874 | if ($res->numRows() != 0) { |
875 | | - $this->mFileInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); |
| 875 | + $this->mFieldInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); |
876 | 876 | return true; |
877 | 877 | } else { |
878 | 878 | return false; |
— | — | @@ -881,8 +881,8 @@ |
882 | 882 | function fieldInfo( $table, $field ) { |
883 | 883 | $table = trim( $table, '"' ); |
884 | 884 | |
885 | | - if (isset($this->mFileInfoCache[$table.'.'.$field])) { |
886 | | - return $this->mFileInfoCache[$table.'.'.$field]; |
| 885 | + if (isset($this->mFieldInfoCache[$table.'.'.$field])) { |
| 886 | + return $this->mFieldInfoCache[$table.'.'.$field]; |
887 | 887 | } elseif ( !isset( $this->fieldInfo_stmt ) ) { |
888 | 888 | $this->fieldInfo_stmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)' ); |
889 | 889 | } |
— | — | @@ -896,8 +896,8 @@ |
897 | 897 | return false; |
898 | 898 | } |
899 | 899 | $res = new ORAResult( $this, $this->fieldInfo_stmt ); |
900 | | - $this->mFileInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); |
901 | | - return $this->mFileInfoCache[$table.'.'.$field]; |
| 900 | + $this->mFieldInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); |
| 901 | + return $this->mFieldInfoCache[$table.'.'.$field]; |
902 | 902 | } |
903 | 903 | |
904 | 904 | function begin( $fname = '' ) { |