Browse Source

Detect MariaDB as MySQL (for mariadb-java-client 2.4+ compatibility)

Closes gh-22344
pull/22392/head
Juergen Hoeller 7 years ago
parent
commit
ac4525ddf8
  1. 5
      spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
  2. 6
      spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml

5
spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -418,6 +418,9 @@ public abstract class JdbcUtils { @@ -418,6 +418,9 @@ public abstract class JdbcUtils {
if (source != null && source.startsWith("DB2")) {
name = "DB2";
}
else if ("MariaDB".equals(source)) {
name = "MySQL";
}
else if ("Sybase SQL Server".equals(source) ||
"Adaptive Server Enterprise".equals(source) ||
"ASE".equals(source) ||

6
spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml

@ -186,6 +186,12 @@ @@ -186,6 +186,12 @@
</bean>
<bean id="MySQL" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="databaseProductNames">
<list>
<value>MySQL</value>
<value>MariaDB</value>
</list>
</property>
<property name="badSqlGrammarCodes">
<value>1054,1064,1146</value>
</property>

Loading…
Cancel
Save