Use MySQL when using Maria driver and MySQL scheme

Author: onobc

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/db/migration/DataFlowFlywayConfigurationCustomizer.java

@@ -15,9 +15,14 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
+import java.lang.reflect.Method;
+import java.sql.DatabaseMetaData;
+
 import javax.sql.DataSource;
 
 import org.flywaydb.core.api.configuration.FluentConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.autoconfigure.flyway.FlywayConfigurationCustomizer;
 import org.springframework.boot.jdbc.DatabaseDriver;
@@ -29,6 +34,7 @@
 import org.springframework.cloud.dataflow.server.db.migration.sqlserver.MsSqlBeforeBaseline;
 import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.jdbc.support.MetaDataAccessException;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * Flyway {@link FlywayConfigurationCustomizer} bean customizing callbacks per
@@ -39,6 +45,8 @@
  */
 public class DataFlowFlywayConfigurationCustomizer implements FlywayConfigurationCustomizer {
 
+	private static final Logger logger = LoggerFactory.getLogger(DataFlowFlywayConfigurationCustomizer.class);
+
 	@Override
 	public void customize(FluentConfiguration configuration) {
 		// boot's flyway auto-config doesn't allow to define callbacks per
@@ -49,7 +57,13 @@ public void customize(FluentConfiguration configuration) {
 			configuration.callbacks(new PostgresBeforeBaseline());
 		}
 		else if (databaseDriver == DatabaseDriver.MARIADB) {
-			configuration.callbacks(new MariadbBeforeBaseline());
+			// if the driver is being used for MySQL server then use MySQL baseline
+			if (vendorIsMySql(dataSource)) {
+				configuration.callbacks(new MysqlBeforeBaseline());
+			}
+			else {
+				configuration.callbacks(new MariadbBeforeBaseline());
+			}
 		}
 		else if (databaseDriver == DatabaseDriver.MYSQL) {
 			configuration.callbacks(new MysqlBeforeBaseline());
@@ -66,13 +80,25 @@ else if (databaseDriver == DatabaseDriver.DB2) {
 	}
 
 	private DatabaseDriver getDatabaseDriver(DataSource dataSource) {
-		// copied from boot's flyway auto-config to get matching db vendor id
 		try {
-			String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL");
+			String url = JdbcUtils.extractDatabaseMetaData(dataSource, DatabaseMetaData::getURL);
 			return DatabaseDriver.fromJdbcUrl(url);
 		}
 		catch (MetaDataAccessException ex) {
 			throw new IllegalStateException(ex);
 		}
+
+	}
+
+	private boolean vendorIsMySql(DataSource dataSource) {
+		try {
+			Method method = ReflectionUtils.findMethod(dataSource.getClass(), "getJdbcUrl");
+			String jdbcUrl = (String) ReflectionUtils.invokeMethod(method, dataSource);
+			return jdbcUrl != null && jdbcUrl.startsWith("jdbc:mysql:");
+		}
+		catch (Exception ex) {
+			logger.error("Unable to get jdbcUrl on datasource and hence unable to determine if DB is MySQL: " + ex.getMessage(), ex);
+		}
+		return false;
 	}
 }