From 7789116f299f43cd3a290567e1c07d2ed16b10ec Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 9 Nov 2010 17:41:00 +0000 Subject: [PATCH] Moved testRunner[|.ora|.postgres].sql to [|oracle/|postgres/]archives/ so that they can be called through DatabaseBase::patchPath(), much simplier --- .../{testRunner.sql => archives/patch-testrun.sql} | 0 .../archives/patch-testrun.sql} | 0 .../archives/patch-testrun.sql} | 0 maintenance/tests/testHelpers.inc | 9 +-------- 4 files changed, 1 insertion(+), 8 deletions(-) rename maintenance/{testRunner.sql => archives/patch-testrun.sql} (100%) rename maintenance/{testRunner.ora.sql => oracle/archives/patch-testrun.sql} (100%) rename maintenance/{testRunner.postgres.sql => postgres/archives/patch-testrun.sql} (100%) diff --git a/maintenance/testRunner.sql b/maintenance/archives/patch-testrun.sql similarity index 100% rename from maintenance/testRunner.sql rename to maintenance/archives/patch-testrun.sql diff --git a/maintenance/testRunner.ora.sql b/maintenance/oracle/archives/patch-testrun.sql similarity index 100% rename from maintenance/testRunner.ora.sql rename to maintenance/oracle/archives/patch-testrun.sql diff --git a/maintenance/testRunner.postgres.sql b/maintenance/postgres/archives/patch-testrun.sql similarity index 100% rename from maintenance/testRunner.postgres.sql rename to maintenance/postgres/archives/patch-testrun.sql diff --git a/maintenance/tests/testHelpers.inc b/maintenance/tests/testHelpers.inc index 24172e457b..0fb4f7dd8b 100644 --- a/maintenance/tests/testHelpers.inc +++ b/maintenance/tests/testHelpers.inc @@ -309,14 +309,7 @@ class DbTestRecorder extends DbTestPreviewer { or ! $this->db->tableExists( 'testitem' ) ) { print "WARNING> `testrun` table not found in database. Trying to create table.\n"; - if ( $wgDBtype === 'postgres' ) { - $this->db->sourceFile( dirname( __FILE__ ) . '/testRunner.postgres.sql' ); - } elseif ( $wgDBtype === 'oracle' ) { - $this->db->sourceFile( dirname( __FILE__ ) . '/testRunner.ora.sql' ); - } else { - $this->db->sourceFile( dirname( __FILE__ ) . '/testRunner.sql' ); - } - + $this->db->sourceFile( $this->db->patchPath( 'patch-testrun.sql' ) ); echo "OK, resuming.\n"; } -- 2.20.1