From 99736c809b4cb0739c05da06bbd9ac34396a2d2c Mon Sep 17 00:00:00 2001 From: Grant Nicholas Date: Fri, 18 Feb 2022 15:06:34 -0600 Subject: [PATCH] Refactor TestingMySqlServer constructor to take version numbers Allows version-based testing of mysql --- .../io/trino/plugin/mysql/TestingMySqlServer.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java index 5a2e28df1cd5..2e76ec14501b 100644 --- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java +++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java @@ -33,6 +33,10 @@ public class TestingMySqlServer private final MySQLContainer container; private final Closeable cleanup; + public final int majorVersion; + public final int minorVersion; + public final int patchVersion; + public TestingMySqlServer() { this(false); @@ -40,11 +44,16 @@ public TestingMySqlServer() public TestingMySqlServer(boolean globalTransactionEnable) { - this("mysql:8.0.12", globalTransactionEnable); + this(8, 0, 12, globalTransactionEnable); } - public TestingMySqlServer(String dockerImageName, boolean globalTransactionEnable) + public TestingMySqlServer(int majorVersion, int minorVersion, int patchVersion, boolean globalTransactionEnable) { + this.majorVersion = majorVersion; + this.minorVersion = minorVersion; + this.patchVersion = patchVersion; + String dockerImageName = format("mysql:%s.%s.%s", majorVersion, minorVersion, patchVersion); + MySQLContainer container = new MySQLContainer<>(dockerImageName); container = container.withDatabaseName("tpch"); if (globalTransactionEnable) {