Merge pull request #220 from zonkyio/mariadb-driver-3

#208 Upgrade to mariadb-java-client 3.1 (JDBC driver)

Author: tomix26

build.gradle

@@ -68,7 +68,7 @@ ext {
                     [name: '8.0',  'mysql': '8.0',  'mysql-driver': 'default']
             ]],
             [name: 'mariadb', versions: [
-                    [name: '10.2',  'mariadb': '10.2',  'mariadb-driver': 'default'],
+                    [name: '10.2',  'mariadb': '10.2',  'mariadb-driver': '2.7.7'],
                     [name: '10.8',  'mariadb': '10.8',  'mariadb-driver': 'default']
             ]],
             [name: 'h2', versions: [
@@ -210,7 +210,7 @@ project(':embedded-database-spring-test') {
         compile 'org.postgresql:postgresql:42.4.2', optional
         compile 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8', optional
         compile 'mysql:mysql-connector-java:8.0.30', optional
-        compile 'org.mariadb.jdbc:mariadb-java-client:2.7.6', optional
+        compile 'org.mariadb.jdbc:mariadb-java-client:3.1.0', optional
         compile 'com.h2database:h2:2.1.214', optional
 
         compile 'org.flywaydb:flyway-core:9.8.2', optional

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mariadb/DockerMariaDBDatabaseProvider.java

@@ -214,9 +214,8 @@ private void executeStatement(ClientConfig config, String ddlStatement) throws S
         private EmbeddedDatabase getDatabase(ClientConfig config, String dbName) throws SQLException {
             MariaDbDataSource dataSource = new MariaDbDataSource();
 
-            dataSource.setServerName(container.getContainerIpAddress());
-            dataSource.setPortNumber(container.getMappedPort(MARIADB_PORT));
-            dataSource.setDatabaseName(dbName);
+            dataSource.setUrl(String.format("jdbc:mariadb://%s:%s/%s",
+                    container.getContainerIpAddress(), container.getMappedPort(MARIADB_PORT), dbName));
 
             if ("mysql".equals(dbName)) {
                 dataSource.setUser("root");

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mariadb/MariaDBEmbeddedDatabase.java

@@ -18,19 +18,29 @@
 
 import io.zonky.test.db.provider.support.AbstractEmbeddedDatabase;
 import org.mariadb.jdbc.MariaDbDataSource;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 import javax.sql.DataSource;
+import java.util.List;
 
 import static io.zonky.test.db.util.ReflectionUtils.getField;
+import static io.zonky.test.db.util.ReflectionUtils.invokeMethod;
 
 public class MariaDBEmbeddedDatabase extends AbstractEmbeddedDatabase {
 
     private final MariaDbDataSource dataSource;
+    private final Object conf;
 
     public MariaDBEmbeddedDatabase(MariaDbDataSource dataSource, Runnable closeCallback) {
         super(closeCallback);
         this.dataSource = dataSource;
+
+        if (ClassUtils.hasMethod(MariaDbDataSource.class, "getUrl")) {
+            conf = getField(dataSource, "conf");
+        } else {
+            conf = null;
+        }
     }
 
     @Override
@@ -41,14 +51,46 @@ protected DataSource getDataSource() {
     @Override
     public String getJdbcUrl() {
         String url = String.format("jdbc:mariadb://%s:%s/%s?user=%s",
-                dataSource.getServerName(), dataSource.getPort(), dataSource.getDatabaseName(), dataSource.getUser());
+                getServerName(), getPortNumber(), getDatabaseName(), dataSource.getUser());
         if (StringUtils.hasText(getPassword())) {
             url += String.format("&password=%s", getPassword());
         }
         return url;
     }
 
+    public String getServerName() {
+        if (conf != null) {
+            return getField(getHostAddress(), "host");
+        } else {
+            return invokeMethod(dataSource, "getServerName");
+        }
+    }
+
+    public int getPortNumber() {
+        if (conf != null) {
+            return getField(getHostAddress(), "port");
+        } else {
+            return invokeMethod(dataSource, "getPortNumber");
+        }
+    }
+
+    public String getDatabaseName() {
+        if (conf != null) {
+            return getField(conf, "database");
+        } else {
+            return invokeMethod(dataSource, "getDatabaseName");
+        }
+    }
+
     private String getPassword() {
         return getField(dataSource, "password");
     }
+
+    private Object getHostAddress() {
+        List<?> addresses = invokeMethod(conf, "addresses");
+        if (addresses != null && addresses.size() > 0) {
+            return addresses.get(0);
+        }
+        throw new IllegalStateException("Missing host address");
+    }
 }

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/mariadb/DockerMariaDBDatabaseProviderTest.java

@@ -237,7 +237,7 @@ public void providersWithDifferentConfigurationShouldNotEquals() {
     }
 
     private static int getPort(DataSource dataSource) throws SQLException {
-        return dataSource.unwrap(MariaDbDataSource.class).getPortNumber();
+        return dataSource.unwrap(MariaDBEmbeddedDatabase.class).getPortNumber();
     }
 
     private static MariaDBContainerCustomizer mariadbContainerCustomizer(long timeout) {