From: daniel <daniel.kinzler@wikimedia.de>
Date: Sat, 6 Jan 2018 10:16:13 +0000 (+0100)
Subject: Fix dropping of temp tables on SQLite and PG.
X-Git-Tag: 1.31.0-rc.0~980
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=969b97f1291a95508de271ba04c30eff0c37ee5d

Fix dropping of temp tables on SQLite and PG.

Also addresses other compatibility issues with PG mentioned
in comments on I7a4071072.

Bug: T184333
Change-Id: I478aa1aee15fdef99630c65a37b1af5f3f8cce14
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 10f5d41fb3..08e4562aeb 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1393,9 +1393,8 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		$this->ensureMockDatabaseConnection( $db );
 
 		foreach ( $tables as $tbl ) {
-			$tmp = self::$useTemporaryTables ? ' TEMPORARY ' : '';
 			$tbl = $db->tableName( $tbl );
-			$db->query( "DROP $tmp TABLE IF EXISTS $tbl", __METHOD__ );
+			$db->query( "DROP TABLE IF EXISTS $tbl", __METHOD__ );
 
 			if ( $tbl === 'page' ) {
 				// Forget about the pages since they don't
diff --git a/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql b/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
index e5ef5c62cc..43e8e9ba34 100644
--- a/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
+++ b/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
@@ -5,9 +5,9 @@ CREATE TABLE /*_*/MediaWikiTestCaseTestTable (
 ) /*$wgDBTableOptions*/;
 
 CREATE TABLE /*_*/imagelinks (
-  il_from int(10) unsigned NOT NULL DEFAULT 0,
-  il_from_namespace int(11) NOT NULL DEFAULT 0,
-  il_to varbinary(255) NOT NULL DEFAULT '',
+  il_from int NOT NULL DEFAULT 0,
+  il_from_namespace int NOT NULL DEFAULT 0,
+  il_to varchar(255) NOT NULL DEFAULT '',
   il_frobniz varchar(255) NOT NULL DEFAULT 'FROB',
   PRIMARY KEY (il_from,il_to)
 ) /*$wgDBTableOptions*/;