Merge "Add DROP INDEX support to DatabaseSqlite::replaceVars method"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Nov 2013 14:18:01 +0000 (14:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Nov 2013 14:18:01 +0000 (14:18 +0000)
1  2 
includes/db/DatabaseSqlite.php
tests/phpunit/includes/db/DatabaseSqliteTest.php

Simple merge
@@@ -149,11 -141,16 +149,19 @@@ class DatabaseSqliteTest extends MediaW
                $this->assertEquals( "ALTER TABLE foo ADD COLUMN foo_bar INTEGER DEFAULT 42",
                        $this->replaceVars( "ALTER TABLE foo\nADD COLUMN foo_bar int(10) unsigned DEFAULT 42" )
                );
+               $this->assertEquals( "DROP INDEX foo",
+                       $this->replaceVars( "DROP INDEX /*i*/foo ON /*_*/bar" )
+               );
+               $this->assertEquals( "DROP INDEX foo -- dropping index",
+                       $this->replaceVars( "DROP INDEX /*i*/foo ON /*_*/bar -- dropping index" )
+               );
        }
  
 +      /**
 +       * @covers DatabaseSqlite::tableName
 +       */
        public function testTableName() {
                // @todo Moar!
                $db = new DatabaseSqliteStandalone( ':memory:' );