From 4df4e7981ba31c72a9cf305a0bd7abb22ada724b Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 21 Dec 2024 10:10:11 +0200 Subject: [PATCH] Add support for tests with mysql without jdbc:mariadib protocol (#2160) Signed-off-by: Avgustin Marinov --- .../hawkbit/repository/test/util/MySqlTestDatabase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MySqlTestDatabase.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MySqlTestDatabase.java index 7299bd22d..733a8a93f 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MySqlTestDatabase.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MySqlTestDatabase.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.extension.Extension; @Slf4j public class MySqlTestDatabase extends AbstractSqlTestDatabase { - protected static final String MYSQL_URI_PATTERN = "jdbc:mariadb://{host}:{port}/{db}*"; + protected static final String MYSQL_URI_PATTERN = "{proto}://{host}:{port}/{db}*"; public MySqlTestDatabase(final DatasourceContext context) { super(context); @@ -51,7 +51,9 @@ public class MySqlTestDatabase extends AbstractSqlTestDatabase { final String uri = context.getDatasourceUrl(); final Map databaseProperties = MATCHER.extractUriTemplateVariables(MYSQL_URI_PATTERN, uri); - return MYSQL_URI_PATTERN.replace("{host}", databaseProperties.get("host")) + return MYSQL_URI_PATTERN + .replace("{proto}", databaseProperties.get("proto")) + .replace("{host}", databaseProperties.get("host")) .replace("{port}", databaseProperties.get("port")) .replace("{db}*", context.getRandomSchemaName()); }