| Index: trunk/phase3/tests/phpunit/includes/db/DatabaseTest.php |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | |
| 14 | 14 | function testAddQuotesNull() { |
| 15 | 15 | $check = "NULL"; |
| 16 | | - if ( $this->db->getType() === 'sqlite' ) { |
| | 16 | + if ( $this->db->getType() === 'sqlite' || $this->db->getType() === 'oracle' ) { |
| 17 | 17 | $check = "''"; |
| 18 | 18 | } |
| 19 | 19 | $this->assertEquals( $check, $this->db->addQuotes( null ) ); |
| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -930,9 +930,9 @@ |
| 931 | 931 | */ |
| 932 | 932 | function tableExists( $table ) { |
| 933 | 933 | $table = $this->tableName( $table ); |
| 934 | | - $table = strtoupper( $this->removeIdentifierQuotes( $table ) ); |
| 935 | | - $owner = strtoupper( $this->mDBname ); |
| 936 | | - $SQL = "SELECT 1 FROM all_tables WHERE owner='$owner' AND table_name='$table'"; |
| | 934 | + $table = $this->addQuotes( strtoupper( $this->removeIdentifierQuotes( $table ) ) ); |
| | 935 | + $owner = $this->addQuotes( strtoupper( $this->mDBname ) ); |
| | 936 | + $SQL = "SELECT 1 FROM all_tables WHERE owner=$owner AND table_name=$table"; |
| 937 | 937 | $res = $this->doQuery( $SQL ); |
| 938 | 938 | if ( $res ) { |
| 939 | 939 | $count = $res->numRows(); |