Index: trunk/phase3/includes/db/DatabaseOracle.php |
— | — | @@ -833,7 +833,7 @@ |
834 | 834 | function fieldExists( $table, $field, $fname = 'DatabaseOracle::fieldExists' ) { |
835 | 835 | $table = trim( $table, '"' ); |
836 | 836 | |
837 | | - if (isset($this->mFieldInfoCache[$table.'.'.$field])) { |
| 837 | + if (isset($this->mFieldInfoCache["$table.$field"])) { |
838 | 838 | return true; |
839 | 839 | } elseif ( !isset( $this->fieldInfo_stmt ) ) { |
840 | 840 | $this->fieldInfo_stmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)' ); |
— | — | @@ -849,7 +849,7 @@ |
850 | 850 | } |
851 | 851 | $res = new ORAResult( $this, $this->fieldInfo_stmt ); |
852 | 852 | if ($res->numRows() != 0) { |
853 | | - $this->mFieldInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); |
| 853 | + $this->mFieldInfoCache["$table.$field"] = new ORAField( $res->fetchRow() ); |
854 | 854 | return true; |
855 | 855 | } else { |
856 | 856 | return false; |
— | — | @@ -859,8 +859,8 @@ |
860 | 860 | function fieldInfo( $table, $field ) { |
861 | 861 | $table = trim( $table, '"' ); |
862 | 862 | |
863 | | - if (isset($this->mFieldInfoCache[$table.'.'.$field])) { |
864 | | - return $this->mFieldInfoCache[$table.'.'.$field]; |
| 863 | + if (isset($this->mFieldInfoCache["$table.$field"])) { |
| 864 | + return $this->mFieldInfoCache["$table.$field"]; |
865 | 865 | } elseif ( !isset( $this->fieldInfo_stmt ) ) { |
866 | 866 | $this->fieldInfo_stmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)' ); |
867 | 867 | } |
— | — | @@ -874,8 +874,8 @@ |
875 | 875 | return false; |
876 | 876 | } |
877 | 877 | $res = new ORAResult( $this, $this->fieldInfo_stmt ); |
878 | | - $this->mFieldInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); |
879 | | - return $this->mFieldInfoCache[$table.'.'.$field]; |
| 878 | + $this->mFieldInfoCache["$table.$field"] = new ORAField( $res->fetchRow() ); |
| 879 | + return $this->mFieldInfoCache["$table.$field"]; |
880 | 880 | } |
881 | 881 | |
882 | 882 | function begin( $fname = '' ) { |