Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-559 - Upgrading the MariaDB JDBC driver.

Browse Source 
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.
This commit is contained in:
Jens Schauder
2020-06-25 13:46:09 +02:00
parent 3b64104f0a
commit 26751fd0c4
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

6
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java
View File

@@ -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;
}

2
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java
View File

@@ -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("");

2
spring-data-jdbc/src/test/resources/logback.xml
View File

@@ -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" />-->