From 960e3c1d466b0f5a278a39824369dbd13a1a702f Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Wed, 13 Feb 2019 15:59:23 -0500
Subject: [PATCH] Treat MariaDB type as MySQL

resolves #514
---
 .../cloud/task/repository/support/DatabaseType.java        | 3 +++
 .../repository/support/TaskExecutionDaoFactoryBean.java    | 3 +--
 .../cloud/task/repository/support/DatabaseTypeTests.java   | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/DatabaseType.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/DatabaseType.java
index 11d113d8..839260af 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/DatabaseType.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/DatabaseType.java
@@ -145,6 +145,9 @@ public enum DatabaseType {
 	 * @throws IllegalArgumentException if none is found.
 	 */
 	public static DatabaseType fromProductName(String productName) {
+		if (productName.equals("MariaDB")) {
+			productName = "MySQL";
+		}
 		if (!dbNameMap.containsKey(productName)) {
 			throw new IllegalArgumentException(
 					"DatabaseType not found for product name: [" + productName + "]");
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java
index 319ebbb2..c999dbda 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java
@@ -101,8 +101,7 @@ public class TaskExecutionDaoFactoryBean implements FactoryBean<TaskExecutionDao
 		this.dao = new JdbcTaskExecutionDao(dataSource, this.tablePrefix);
 		String databaseType;
 		try {
-			databaseType = org.springframework.batch.support.DatabaseType
-					.fromMetaData(dataSource).name();
+			databaseType = DatabaseType.fromMetaData(dataSource).name();
 		}
 		catch (MetaDataAccessException e) {
 			throw new IllegalStateException(e);
diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/DatabaseTypeTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/DatabaseTypeTests.java
index 0e30851b..cefe8aaf 100644
--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/DatabaseTypeTests.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/DatabaseTypeTests.java
@@ -45,6 +45,7 @@ public class DatabaseTypeTests {
 		assertThat(fromProductName("Oracle")).isEqualTo(ORACLE);
 		assertThat(fromProductName("PostgreSQL")).isEqualTo(POSTGRES);
 		assertThat(fromProductName("MySQL")).isEqualTo(MYSQL);
+		assertThat(fromProductName("MariaDB")).isEqualTo(MYSQL);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -76,4 +77,10 @@ public class DatabaseTypeTests {
 		assertThat(DatabaseType.fromMetaData(ds)).isEqualTo(MYSQL);
 	}
 
+	@Test
+	public void testFromMetaDataForMariaDB() throws Exception {
+		DataSource ds = TestDBUtils.getMockDataSource("MariaDB");
+		assertThat(DatabaseType.fromMetaData(ds)).isEqualTo(MYSQL);
+	}
+
 }