X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=blobdiff_plain;f=tests%2Fphpunit%2FMediaWikiIntegrationTestCase.php;h=7aa161484eb20290976aade30f4cec6d379aa7cb;hb=807d793ab907984c9f347df9d672aadb5db78b38;hp=07d135de8ddc1a9979fcfa0f00b7b77c1f5af4c3;hpb=12e0f910b42bd73cca6a2b4cec78161d80cb2447;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php index 07d135de8d..7aa161484e 100644 --- a/tests/phpunit/MediaWikiIntegrationTestCase.php +++ b/tests/phpunit/MediaWikiIntegrationTestCase.php @@ -136,10 +136,9 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { private $overriddenServices = []; /** - * Table name prefixes. Oracle likes it shorter. + * Table name prefix. */ const DB_PREFIX = 'unittest_'; - const ORA_DB_PREFIX = 'ut_'; /** * @var array @@ -149,7 +148,6 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { 'mysql', 'sqlite', 'postgres', - 'oracle' ]; public function __construct( $name = null, array $data = [], $dataName = '' ) { @@ -1318,7 +1316,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { * @since 1.32 */ public static function getTestPrefixFor( IDatabase $db ) { - return $db->getType() == 'oracle' ? self::ORA_DB_PREFIX : self::DB_PREFIX; + return self::DB_PREFIX; } /** @@ -1411,32 +1409,6 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { * @since 1.32 */ protected function addCoreDBData() { - if ( $this->db->getType() == 'oracle' ) { - # Insert 0 user to prevent FK violations - # Anonymous user - if ( !$this->db->selectField( 'user', '1', [ 'user_id' => 0 ] ) ) { - $this->db->insert( 'user', [ - 'user_id' => 0, - 'user_name' => 'Anonymous' ], __METHOD__, [ 'IGNORE' ] ); - } - - # Insert 0 page to prevent FK violations - # Blank page - if ( !$this->db->selectField( 'page', '1', [ 'page_id' => 0 ] ) ) { - $this->db->insert( 'page', [ - 'page_id' => 0, - 'page_namespace' => 0, - 'page_title' => ' ', - 'page_restrictions' => null, - 'page_is_redirect' => 0, - 'page_is_new' => 0, - 'page_random' => 0, - 'page_touched' => $this->db->timestamp(), - 'page_latest' => 0, - 'page_len' => 0 ], __METHOD__, [ 'IGNORE' ] ); - } - } - SiteStatsInit::doPlaceholderInit(); User::resetIdByNameCache(); @@ -1520,7 +1492,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { $prefix = self::getTestPrefixFor( $db ); } - if ( ( $db->getType() == 'oracle' || !self::$useTemporaryTables ) && self::$reuseDB ) { + if ( !self::$useTemporaryTables && self::$reuseDB ) { $db->tablePrefix( $prefix ); return false; } @@ -1609,12 +1581,6 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { return; } - // Assuming this isn't needed for External Store database, and not sure if the procedure - // would be available there. - if ( $db->getType() == 'oracle' ) { - $db->query( 'BEGIN FILL_WIKI_INFO; END;', __METHOD__ ); - } - Hooks::run( 'UnitTestsAfterDatabaseSetup', [ $db, $prefix ] ); } @@ -1928,7 +1894,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { $tablesUsed = array_unique( array_merge( $tablesUsed, $pageTables ) ); } - // Postgres, Oracle, and MSSQL all use mwuser/pagecontent + // Postgres uses mwuser/pagecontent // instead of user/text. But Postgres does not remap the // table name in tableExists(), so we mark the real table // names as being used. @@ -1971,7 +1937,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase { return; } - $truncate = in_array( $db->getType(), [ 'oracle', 'mysql' ] ); + $truncate = in_array( $db->getType(), [ 'mysql' ] ); if ( $truncate ) { $db->query( 'TRUNCATE TABLE ' . $db->tableName( $tableName ), __METHOD__ );