From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 5 Nov 2013 14:18:01 +0000 (+0000)
Subject: Merge "Add DROP INDEX support to DatabaseSqlite::replaceVars method"
X-Git-Tag: 1.31.0-rc.0~18291
X-Git-Url: http://git.cyclocoop.org//%22%22._DIR_PLUGIN_FULLCALENDAR.%22prive/themes/spip/images/event_edit.png/%22?a=commitdiff_plain;h=a443be2747d49938dd7beb2fa08d1aefcf15ed7b;p=lhc%2Fweb%2Fwiklou.git

Merge "Add DROP INDEX support to DatabaseSqlite::replaceVars method"
---

a443be2747d49938dd7beb2fa08d1aefcf15ed7b
diff --cc tests/phpunit/includes/db/DatabaseSqliteTest.php
index 70ee9465c3,36e8d4b551..65726ebe84
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@@ -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:' );