From 52e05f37bd669782a3a338bcfc2572abdf6a23c3 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

resolved Merge issues on cherry-pick
---
 .../task/repository/support/DatabaseType.java    | 11 +++++++----
 .../support/TaskExecutionDaoFactoryBean.java     |  2 +-
 .../repository/support/DatabaseTypeTests.java    | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 9 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 90403d6b..0893b0c6 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
@@ -101,10 +101,13 @@ public enum DatabaseType {
 	 * @return DatabaseType for given product name.
 	 * @throws IllegalArgumentException if none is found.
 	 */
-	public static DatabaseType fromProductName(String productName){
-		if(!dbNameMap.containsKey(productName)){
-			throw new IllegalArgumentException("DatabaseType not found for product name: [" +
-					productName + "]");
+	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 + "]");
 		}
 		else{
 			return dbNameMap.get(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 f45f843c..62e7e3d8 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,7 +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 b122113b..b8b7567f 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
@@ -15,6 +15,7 @@
  */
 package org.springframework.cloud.task.repository.support;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.cloud.task.repository.support.DatabaseType.HSQL;
 import static org.springframework.cloud.task.repository.support.DatabaseType.MYSQL;
@@ -39,10 +40,11 @@ public class DatabaseTypeTests {
 
 	@Test
 	public void testFromProductName() {
-		assertEquals(HSQL, fromProductName("HSQL Database Engine"));
-		assertEquals(ORACLE, fromProductName("Oracle"));
-		assertEquals(POSTGRES, fromProductName("PostgreSQL"));
-		assertEquals(MYSQL, fromProductName("MySQL"));
+		assertThat(fromProductName("HSQL Database Engine")).isEqualTo(HSQL);
+		assertThat(fromProductName("Oracle")).isEqualTo(ORACLE);
+		assertThat(fromProductName("PostgreSQL")).isEqualTo(POSTGRES);
+		assertThat(fromProductName("MySQL")).isEqualTo(MYSQL);
+		assertThat(fromProductName("MariaDB")).isEqualTo(MYSQL);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -74,4 +76,10 @@ public class DatabaseTypeTests {
 		assertEquals(MYSQL, DatabaseType.fromMetaData(ds));
 	}
 
+	@Test
+	public void testFromMetaDataForMariaDB() throws Exception {
+		DataSource ds = TestDBUtils.getMockDataSource("MariaDB");
+		assertThat(DatabaseType.fromMetaData(ds)).isEqualTo(MYSQL);
+	}
+
 }