* merge r89759 from REL1_17 into trunk

* changed addQuotes expected result for addQuotes in DatabaseTest

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index b298545..22aa7ce 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -930,9 +930,9 @@ class DatabaseOracle extends DatabaseBase {
         */
        function tableExists( $table ) {
                $table = $this->tableName( $table );
-               $table = strtoupper( $this->removeIdentifierQuotes( $table ) );
-               $owner = strtoupper( $this->mDBname );
-               $SQL = "SELECT 1 FROM all_tables WHERE owner='$owner' AND table_name='$table'";
+               $table = $this->addQuotes( strtoupper( $this->removeIdentifierQuotes( $table ) ) );
+               $owner = $this->addQuotes( strtoupper( $this->mDBname ) );
+               $SQL = "SELECT 1 FROM all_tables WHERE owner=$owner AND table_name=$table";
                $res = $this->doQuery( $SQL );
                if ( $res ) {
                        $count = $res->numRows();

diff --git a/tests/phpunit/includes/db/DatabaseTest.php b/tests/phpunit/includes/db/DatabaseTest.php
index e886fa8..6de510a 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -12,7 +12,7 @@ class DatabaseTest extends MediaWikiTestCase {
 
        function testAddQuotesNull() {
                $check = "NULL";
-               if ( $this->db->getType() === 'sqlite' ) {
+               if ( $this->db->getType() === 'sqlite' || $this->db->getType() === 'oracle' ) {
                        $check = "''";
                }
                $this->assertEquals( $check, $this->db->addQuotes( null ) );