Merge pull request #541 from kazuki43zoo/gh-540_support-spring-5.3

Support Spring 5.3

Author: kazuki43zoo

pom.xml

@@ -106,7 +106,7 @@
     <osgi.dynamicImport>*</osgi.dynamicImport>
 
     <mybatis.version>3.5.6</mybatis.version>
-    <spring.version>5.2.9.RELEASE</spring.version>
+    <spring.version>5.3.0</spring.version>
     <spring-batch.version>4.3.0</spring-batch.version>
     <module.name>org.mybatis.spring</module.name>
 

src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java

@@ -23,6 +23,7 @@
 import org.apache.ibatis.exceptions.PersistenceException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLExceptionTranslator;
 import org.springframework.transaction.TransactionException;
@@ -85,7 +86,10 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) {
       }
       if (e.getCause() instanceof SQLException) {
         this.initExceptionTranslator();
-        return this.exceptionTranslator.translate(e.getMessage() + "\n", null, (SQLException) e.getCause());
+        String task = e.getMessage() + "\n";
+        SQLException se = (SQLException) e.getCause();
+        DataAccessException dae = this.exceptionTranslator.translate(task, null, se);
+        return dae != null ? dae : new UncategorizedSQLException(task, null, se);
       } else if (e.getCause() instanceof TransactionException) {
         throw (TransactionException) e.getCause();
       }