Log column type for limited support message in getResultSetValue

jhoeller · jhoeller · commit 1d2daa5d6ec1 · 2024-04-09T16:23:19.000+02:00
Closes gh-32601 (cherry picked from commit c5590ae)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -228,14 +228,14 @@ else if (obj instanceof Number) {
 			try {
 				return rs.getObject(index, requiredType);
 			}
-			catch (AbstractMethodError err) {
-				logger.debug("JDBC driver does not implement JDBC 4.1 'getObject(int, Class)' method", err);
-			}
-			catch (SQLFeatureNotSupportedException ex) {
+			catch (SQLFeatureNotSupportedException | AbstractMethodError ex) {
 				logger.debug("JDBC driver does not support JDBC 4.1 'getObject(int, Class)' method", ex);
 			}
 			catch (SQLException ex) {
-				logger.debug("JDBC driver has limited support for JDBC 4.1 'getObject(int, Class)' method", ex);
+				if (logger.isDebugEnabled()) {
+					logger.debug("JDBC driver has limited support for 'getObject(int, Class)' with column type: " +
+							requiredType.getName(), ex);
+				}
 			}
 
 			// Corresponding SQL types for JSR-310 / Joda-Time types, left up

Original file line number	Diff line number	Diff line change
`@@ -228,14 +228,14 @@ else if (obj instanceof Number) {`
`228`	`228`	`try {`
`229`	`229`	`return rs.getObject(index, requiredType);`
`230`	`230`	`}`
`231`		`- catch (AbstractMethodError err) {`
`232`		`- logger.debug("JDBC driver does not implement JDBC 4.1 'getObject(int, Class)' method", err);`
`233`		`- }`
`234`		`- catch (SQLFeatureNotSupportedException ex) {`
	`231`	`+ catch (SQLFeatureNotSupportedException \| AbstractMethodError ex) {`
`235`	`232`	`logger.debug("JDBC driver does not support JDBC 4.1 'getObject(int, Class)' method", ex);`
`236`	`233`	`}`
`237`	`234`	`catch (SQLException ex) {`
`238`		`- logger.debug("JDBC driver has limited support for JDBC 4.1 'getObject(int, Class)' method", ex);`
	`235`	`+ if (logger.isDebugEnabled()) {`
	`236`	`+ logger.debug("JDBC driver has limited support for 'getObject(int, Class)' with column type: " +`
	`237`	`+ requiredType.getName(), ex);`
	`238`	`+ }`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`// Corresponding SQL types for JSR-310 / Joda-Time types, left up`