diff --git a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/OracleQueryRunner.java b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/OracleQueryRunner.java index 9412a85efd5a8..cf984e31eabec 100644 --- a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/OracleQueryRunner.java +++ b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/OracleQueryRunner.java @@ -35,19 +35,7 @@ public final class OracleQueryRunner { private OracleQueryRunner() {} - public static DistributedQueryRunner createOracleQueryRunner(TestingOracleServer server, Iterable> tables) - throws Exception - { - return createQueryRunner(server, tables, false); - } - - public static DistributedQueryRunner createOraclePoolQueryRunner(TestingOracleServer server, Iterable> tables) - throws Exception - { - return createQueryRunner(server, tables, true); - } - - private static DistributedQueryRunner createQueryRunner(TestingOracleServer server, Iterable> tables, boolean connectionPoolEnabled) + public static DistributedQueryRunner createOracleQueryRunner(TestingOracleServer server, Iterable> tables, boolean connectionPoolEnabled) throws Exception { DistributedQueryRunner queryRunner = null; @@ -92,7 +80,8 @@ public static void main(String[] args) DistributedQueryRunner queryRunner = createOracleQueryRunner( new TestingOracleServer(), - TpchTable.getTables()); + TpchTable.getTables(), + false); Logger log = Logger.get(OracleQueryRunner.class); log.info("======== SERVER STARTED ========"); diff --git a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleDistributedQueries.java b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleDistributedQueries.java index d2e5dd4e48416..89a48f2e78fa3 100644 --- a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleDistributedQueries.java +++ b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleDistributedQueries.java @@ -46,9 +46,7 @@ protected QueryRunner createQueryRunner() throws Exception { this.oracleServer = new TestingOracleServer(); - return OracleQueryRunner.createOracleQueryRunner( - oracleServer, - TpchTable.getTables()); + return OracleQueryRunner.createOracleQueryRunner(oracleServer, TpchTable.getTables(), false); } @AfterClass(alwaysRun = true) diff --git a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleIntegrationSmokeTest.java b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleIntegrationSmokeTest.java index f3b54715b58fd..29283180ac0b1 100644 --- a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleIntegrationSmokeTest.java +++ b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleIntegrationSmokeTest.java @@ -39,7 +39,7 @@ protected QueryRunner createQueryRunner() throws Exception { oracleServer = new TestingOracleServer(); - return OracleQueryRunner.createOracleQueryRunner(oracleServer, ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION)); + return OracleQueryRunner.createOracleQueryRunner(oracleServer, ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION), false); } @AfterClass(alwaysRun = true) diff --git a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOraclePoolIntegrationSmokeTest.java b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOraclePoolIntegrationSmokeTest.java index 0d193b9fdd8da..26b53a2e9e8a7 100644 --- a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOraclePoolIntegrationSmokeTest.java +++ b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOraclePoolIntegrationSmokeTest.java @@ -36,7 +36,7 @@ protected QueryRunner createQueryRunner() throws Exception { oracleServer = new TestingOracleServer(); - return OracleQueryRunner.createOraclePoolQueryRunner(oracleServer, ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION)); + return OracleQueryRunner.createOracleQueryRunner(oracleServer, ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION), true); } @AfterClass(alwaysRun = true) diff --git a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleTypeMapping.java b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleTypeMapping.java index 9029c4e44dc00..9eec8e5606c09 100644 --- a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleTypeMapping.java +++ b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/TestOracleTypeMapping.java @@ -18,8 +18,6 @@ import io.prestosql.testing.sql.SqlExecutor; import org.testng.annotations.AfterClass; -import static io.prestosql.plugin.oracle.OracleQueryRunner.createOracleQueryRunner; - public class TestOracleTypeMapping extends AbstractTestOracleTypeMapping { @@ -30,7 +28,7 @@ protected QueryRunner createQueryRunner() throws Exception { this.oracleServer = new TestingOracleServer(); - return createOracleQueryRunner(oracleServer, ImmutableList.of()); + return OracleQueryRunner.createOracleQueryRunner(oracleServer, ImmutableList.of(), false); } @AfterClass(alwaysRun = true)