Skip to content

Commit 6a4c4a1

Browse files
committed
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: spring-projects#231.
1 parent d9f8567 commit 6a4c4a1

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<mybatis-spring.version>2.0.0</mybatis-spring.version>
3535
<mysql-connector-java.version>5.1.41</mysql-connector-java.version>
3636
<postgresql.version>42.0.0</postgresql.version>
37-
<mariadb-java-client.version>2.2.3</mariadb-java-client.version>
37+
<mariadb-java-client.version>2.6.0</mariadb-java-client.version>
3838
<jsr305.version>3.0.2</jsr305.version>
3939
</properties>
4040

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
import javax.sql.DataSource;
2626

27+
import org.apache.commons.logging.Log;
28+
import org.apache.commons.logging.LogFactory;
2729
import org.springframework.core.io.support.SpringFactoriesLoader;
2830
import org.springframework.dao.NonTransientDataAccessException;
2931
import org.springframework.data.relational.core.dialect.Db2Dialect;
@@ -52,6 +54,8 @@
5254
*/
5355
public class DialectResolver {
5456

57+
private static final Log LOG = LogFactory.getLog(DialectResolver.class);
58+
5559
private static final List<JdbcDialectProvider> DETECTORS = SpringFactoriesLoader
5660
.loadFactories(JdbcDialectProvider.class, DialectResolver.class.getClassLoader());
5761

@@ -127,6 +131,8 @@ private static Dialect getDialect(Connection connection) throws SQLException {
127131
if (name.contains("db2")) {
128132
return Db2Dialect.INSTANCE;
129133
}
134+
135+
LOG.info(String.format("Couldn't determine Dialect for \"%s\"", name) );
130136
return null;
131137
}
132138

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected DataSource createDataSource() {
5151

5252
if (MARIADB_CONTAINER == null) {
5353

54-
MariaDBContainer<?> container = new MariaDBContainer<>()
54+
MariaDBContainer<?> container = new MariaDBContainer<>("mariadb:10.5")
5555
.withUsername("root")
5656
.withPassword("")
5757
.withConfigurationOverride("");

spring-data-jdbc/src/test/resources/logback.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</appender>
99

1010
<logger name="org.springframework.test.context.TestContextManager" level="off" />
11-
<!--<logger name="org.springframework.data" level="info" />-->
11+
<logger name="org.springframework.data" level="info" />
1212
<!--<logger name="org.springframework.jdbc.core" level="trace" />-->
1313
<!--<logger name="org.springframework.data.jdbc.mybatis.DummyEntityMapper" level="trace" />-->
1414

0 commit comments

Comments
 (0)