From 6a4c4a1f154614fc1450c799ea38c13645cbf61c Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@vmware.com>
Date: Thu, 25 Jun 2020 13:46:09 +0200
Subject: [PATCH] DATAJDBC-559 - Upgrading the MariaDB JDBC driver.

This changes the behavior of the JDBC driver from always returning `MySQL` for product name to a more involved logic which might result in it returning  `MariaDB`.

Original pull request: #231.
---
 pom.xml                                                     | 2 +-
 .../data/jdbc/repository/config/DialectResolver.java        | 6 ++++++
 .../data/jdbc/testing/MariaDBDataSourceConfiguration.java   | 2 +-
 spring-data-jdbc/src/test/resources/logback.xml             | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd2bedb3..84bf6105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 		<mybatis-spring.version>2.0.0</mybatis-spring.version>
 		<mysql-connector-java.version>5.1.41</mysql-connector-java.version>
 		<postgresql.version>42.0.0</postgresql.version>
-		<mariadb-java-client.version>2.2.3</mariadb-java-client.version>
+		<mariadb-java-client.version>2.6.0</mariadb-java-client.version>
 		<jsr305.version>3.0.2</jsr305.version>
 	</properties>
 
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java
index 7aca7c53..04f0823e 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java
@@ -24,6 +24,8 @@ import java.util.Optional;
 
 import javax.sql.DataSource;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.data.relational.core.dialect.Db2Dialect;
@@ -52,6 +54,8 @@ import org.springframework.util.StringUtils;
  */
 public class DialectResolver {
 
+	private static final Log LOG = LogFactory.getLog(DialectResolver.class);
+
 	private static final List<JdbcDialectProvider> DETECTORS = SpringFactoriesLoader
 			.loadFactories(JdbcDialectProvider.class, DialectResolver.class.getClassLoader());
 
@@ -127,6 +131,8 @@ public class DialectResolver {
 			if (name.contains("db2")) {
 				return Db2Dialect.INSTANCE;
 			}
+
+			LOG.info(String.format("Couldn't determine Dialect for \"%s\"", name) );
 			return null;
 		}
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java
index 640b7cd3..31d6f985 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java
@@ -51,7 +51,7 @@ class MariaDBDataSourceConfiguration extends DataSourceConfiguration {
 
 		if (MARIADB_CONTAINER == null) {
 
-			MariaDBContainer<?> container = new MariaDBContainer<>()
+			MariaDBContainer<?> container = new MariaDBContainer<>("mariadb:10.5")
 					.withUsername("root")
 					.withPassword("")
 					.withConfigurationOverride("");
diff --git a/spring-data-jdbc/src/test/resources/logback.xml b/spring-data-jdbc/src/test/resources/logback.xml
index 814c114d..5288df9b 100644
--- a/spring-data-jdbc/src/test/resources/logback.xml
+++ b/spring-data-jdbc/src/test/resources/logback.xml
@@ -8,7 +8,7 @@
 	</appender>
 
 	<logger name="org.springframework.test.context.TestContextManager" level="off" />
-	<!--<logger name="org.springframework.data" level="info" />-->
+	<logger name="org.springframework.data" level="info" />
 	<!--<logger name="org.springframework.jdbc.core" level="trace" />-->
 	<!--<logger name="org.springframework.data.jdbc.mybatis.DummyEntityMapper" level="trace" />-->