Handling for MariaDB versions

Author: aguibert

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2DatabaseMetaData.java renamed to vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2DatabaseMetadata.java

@@ -1,16 +1,29 @@
 package io.vertx.mysqlclient.impl;
 
+import java.util.Objects;
+
 import io.vertx.sqlclient.spi.DatabaseMetadata;
 
 public class MySQLDatabaseMetadata implements DatabaseMetadata {
 
+  private final String fullVersion;
+  private final boolean isMariaDB;
   private final int majorVersion;
   private final int minorVersion;
   private final int microVersion;
 
   public MySQLDatabaseMetadata(String serverVersion) {
-    // we assume the server version follows ${major}.${minor}.${micro} in https://dev.mysql.com/doc/refman/8.0/en/which-version.html
-    String[] versionNumbers = serverVersion.split("\\.");
+    fullVersion = serverVersion;
+    isMariaDB = serverVersion.toUpperCase().contains("MARIADB");  
+    String[] versionNumbers;
+    if (!isMariaDB) {
+      // we assume the server version follows ${major}.${minor}.${micro} in https://dev.mysql.com/doc/refman/8.0/en/which-version.html
+      versionNumbers = serverVersion.split("\\.");
+    } else {
+      // server version follows ${junk}-${major}.${minor}.${micro}-MariaDB-${junk}
+      String[] parts = serverVersion.split("-");
+      versionNumbers = parts[1].split("\\.");
+    }
     majorVersion = Integer.parseInt(versionNumbers[0]);
     minorVersion = Integer.parseInt(versionNumbers[1]);
     // we should truncate the possible suffixes here
@@ -24,19 +37,28 @@ public MySQLDatabaseMetadata(String serverVersion) {
       microVersion = Integer.parseInt(versionNumbers[2]);
     }
   }
+  
+  public boolean isMariaDB() {
+    return isMariaDB;
+  }
 
   @Override
-  public String getProductName() {
-    return "MySQL"; // TODO: Should this return MariaDB sometimes?
+  public String productName() {
+    return isMariaDB ? "MariaDB" : "MySQL";
+  }
+  
+  @Override
+  public String fullVersion() {
+    return fullVersion;
   }
 
   @Override
-  public int getMajorVersion() {
+  public int majorVersion() {
     return majorVersion;
   }
 
   @Override
-  public int getMinorVersion() {
+  public int minorVersion() {
     return minorVersion;
   }
 

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLDatabaseMetaData.java renamed to vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLDatabaseMetadata.java

@@ -69,8 +69,8 @@ private void handleInitialHandshake(ByteBuf payload) {
     String serverVersion = BufferUtils.readNullTerminatedString(payload, StandardCharsets.US_ASCII);
     MySQLDatabaseMetadata md = new MySQLDatabaseMetadata(serverVersion);
     ((MySQLSocketConnection)cmd.connection()).metaData = md;
-    if (md.getMajorVersion() == 5 && 
-        (md.getMinorVersion() < 7 || (md.getMinorVersion() == 7 && md.getDatabasMicroVersion() < 5))) {
+    if (md.majorVersion() == 5 && 
+        (md.minorVersion() < 7 || (md.minorVersion() == 7 && md.getDatabasMicroVersion() < 5))) {
       // EOF_HEADER is enabled
     } else {
       encoder.clientCapabilitiesFlag |= CLIENT_DEPRECATE_EOF;

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLDatabaseMetaData.java renamed to vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLDatabaseMetadata.java

@@ -40,17 +40,17 @@ public void tearDown(TestContext ctx) {
   @Override
   protected void validateDatabaseMetaData(TestContext ctx, DatabaseMetadata md) {
     if (rule.isUsingMariaDB()) {
-      ctx.assertTrue(md.getMajorVersion() >= 10);
+      ctx.assertTrue(md.majorVersion() >= 10, "Expected DB major version >= 10 but was " + md.majorVersion());
     }
     else if (rule.isUsingMySQL5_6()) {
-      ctx.assertEquals(5, md.getMajorVersion());
-      ctx.assertEquals(6, md.getMinorVersion());
+      ctx.assertEquals(5, md.majorVersion());
+      ctx.assertEquals(6, md.minorVersion());
     }
     else if (rule.isUsingMySQL8()) {
-      ctx.assertEquals(8, md.getMajorVersion());
+      ctx.assertEquals(8, md.majorVersion());
     }
     else {
-      ctx.assertTrue(md.getMajorVersion() >= 5);
+      ctx.assertTrue(md.majorVersion() >= 5, "Expected DB major version >= 5 but was " + md.majorVersion());
     }
   }
 }