Merge branch '6.2.x'

jhoeller · jhoeller · commit 34562d3145ec · 2025-10-30T15:32:36.000+01:00
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
@@ -80,43 +80,43 @@ public SQLExceptionSubclassTranslator() {
 
 		if (sqlEx instanceof SQLTransientException) {
 			if (sqlEx instanceof SQLTransientConnectionException) {
-				return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), ex);
 			}
 			if (sqlEx instanceof SQLTransactionRollbackException) {
 				if (SQLStateSQLExceptionTranslator.indicatesCannotAcquireLock(sqlEx.getSQLState())) {
-					return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), sqlEx);
+					return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), ex);
 				}
-				return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), ex);
 			}
 			if (sqlEx instanceof SQLTimeoutException) {
-				return new QueryTimeoutException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new QueryTimeoutException(buildMessage(task, sql, sqlEx), ex);
 			}
 		}
 		else if (sqlEx instanceof SQLNonTransientException) {
 			if (sqlEx instanceof SQLNonTransientConnectionException) {
-				return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), ex);
 			}
 			if (sqlEx instanceof SQLDataException) {
-				return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), ex);
 			}
 			if (sqlEx instanceof SQLIntegrityConstraintViolationException) {
 				if (SQLStateSQLExceptionTranslator.indicatesDuplicateKey(sqlEx.getSQLState(), sqlEx.getErrorCode())) {
-					return new DuplicateKeyException(buildMessage(task, sql, sqlEx), sqlEx);
+					return new DuplicateKeyException(buildMessage(task, sql, sqlEx), ex);
 				}
-				return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), ex);
 			}
 			if (sqlEx instanceof SQLInvalidAuthorizationSpecException) {
-				return new PermissionDeniedDataAccessException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new PermissionDeniedDataAccessException(buildMessage(task, sql, sqlEx), ex);
 			}
 			if (sqlEx instanceof SQLSyntaxErrorException) {
-				return new BadSqlGrammarException(task, (sql != null ? sql : ""), sqlEx);
+				return new BadSqlGrammarException(task, (sql != null ? sql : ""), ex);
 			}
 			if (sqlEx instanceof SQLFeatureNotSupportedException) {
-				return new InvalidDataAccessApiUsageException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new InvalidDataAccessApiUsageException(buildMessage(task, sql, sqlEx), ex);
 			}
 		}
 		else if (sqlEx instanceof SQLRecoverableException) {
-			return new RecoverableDataAccessException(buildMessage(task, sql, sqlEx), sqlEx);
+			return new RecoverableDataAccessException(buildMessage(task, sql, sqlEx), ex);
 		}
 
 		// Fallback to Spring's own SQL state translation...
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
@@ -131,35 +131,35 @@ public class SQLStateSQLExceptionTranslator extends AbstractFallbackSQLException
 				logger.debug("Extracted SQL state class '" + classCode + "' from value '" + sqlState + "'");
 			}
 			if (BAD_SQL_GRAMMAR_CODES.contains(classCode)) {
-				return new BadSqlGrammarException(task, (sql != null ? sql : ""), sqlEx);
+				return new BadSqlGrammarException(task, (sql != null ? sql : ""), ex);
 			}
 			else if (DATA_INTEGRITY_VIOLATION_CODES.contains(classCode)) {
 				if (indicatesDuplicateKey(sqlState, sqlEx.getErrorCode())) {
-					return new DuplicateKeyException(buildMessage(task, sql, sqlEx), sqlEx);
+					return new DuplicateKeyException(buildMessage(task, sql, sqlEx), ex);
 				}
-				return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), ex);
 			}
 			else if (PESSIMISTIC_LOCKING_FAILURE_CODES.contains(classCode)) {
 				if (indicatesCannotAcquireLock(sqlState)) {
-					return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), sqlEx);
+					return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), ex);
 				}
-				return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), ex);
 			}
 			else if (DATA_ACCESS_RESOURCE_FAILURE_CODES.contains(classCode)) {
 				if (indicatesQueryTimeout(sqlState)) {
-					return new QueryTimeoutException(buildMessage(task, sql, sqlEx), sqlEx);
+					return new QueryTimeoutException(buildMessage(task, sql, sqlEx), ex);
 				}
-				return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), ex);
 			}
 			else if (TRANSIENT_DATA_ACCESS_RESOURCE_CODES.contains(classCode)) {
-				return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), sqlEx);
+				return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), ex);
 			}
 		}
 
 		// For MySQL: exception class name indicating a timeout?
 		// (since MySQL doesn't throw the JDBC 4 SQLTimeoutException)
 		if (sqlEx.getClass().getName().contains("Timeout")) {
-			return new QueryTimeoutException(buildMessage(task, sql, sqlEx), sqlEx);
+			return new QueryTimeoutException(buildMessage(task, sql, sqlEx), ex);
 		}
 
 		// Couldn't resolve anything proper - resort to UncategorizedSQLException.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java
@@ -181,8 +181,7 @@ private void assertTranslation(SQLException ex, @Nullable Class<?> dataAccessExc
 	static void assertTranslation(DataAccessException dae, SQLException ex, Class<?> dataAccessExceptionType) {
 		assertThat(dae).as("Specific translation must not result in null").isNotNull();
 		assertThat(dae).as("Wrong DataAccessException type returned").isExactlyInstanceOf(dataAccessExceptionType);
-		assertThat(dae.getCause()).as("The exact same original SQLException must be preserved").isSameAs(
-				ex instanceof BatchUpdateException bue ? bue.getNextException() : ex);
+		assertThat(dae.getCause()).as("The exact same original SQLException must be preserved").isSameAs(ex);
 	}
 
 	static BatchUpdateException buildBatchUpdateException(@Nullable String sqlState, SQLException next) {

Original file line number	Diff line number	Diff line change
`@@ -80,43 +80,43 @@ public SQLExceptionSubclassTranslator() {`
`80`	`80`
`81`	`81`	`if (sqlEx instanceof SQLTransientException) {`
`82`	`82`	`if (sqlEx instanceof SQLTransientConnectionException) {`
`83`		`- return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), sqlEx);`
	`83`	`+ return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), ex);`
`84`	`84`	`}`
`85`	`85`	`if (sqlEx instanceof SQLTransactionRollbackException) {`
`86`	`86`	`if (SQLStateSQLExceptionTranslator.indicatesCannotAcquireLock(sqlEx.getSQLState())) {`
`87`		`- return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), sqlEx);`
	`87`	`+ return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), ex);`
`88`	`88`	`}`
`89`		`- return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), sqlEx);`
	`89`	`+ return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), ex);`
`90`	`90`	`}`
`91`	`91`	`if (sqlEx instanceof SQLTimeoutException) {`
`92`		`- return new QueryTimeoutException(buildMessage(task, sql, sqlEx), sqlEx);`
	`92`	`+ return new QueryTimeoutException(buildMessage(task, sql, sqlEx), ex);`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`else if (sqlEx instanceof SQLNonTransientException) {`
`96`	`96`	`if (sqlEx instanceof SQLNonTransientConnectionException) {`
`97`		`- return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), sqlEx);`
	`97`	`+ return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), ex);`
`98`	`98`	`}`
`99`	`99`	`if (sqlEx instanceof SQLDataException) {`
`100`		`- return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), sqlEx);`
	`100`	`+ return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), ex);`
`101`	`101`	`}`
`102`	`102`	`if (sqlEx instanceof SQLIntegrityConstraintViolationException) {`
`103`	`103`	`if (SQLStateSQLExceptionTranslator.indicatesDuplicateKey(sqlEx.getSQLState(), sqlEx.getErrorCode())) {`
`104`		`- return new DuplicateKeyException(buildMessage(task, sql, sqlEx), sqlEx);`
	`104`	`+ return new DuplicateKeyException(buildMessage(task, sql, sqlEx), ex);`
`105`	`105`	`}`
`106`		`- return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), sqlEx);`
	`106`	`+ return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), ex);`
`107`	`107`	`}`
`108`	`108`	`if (sqlEx instanceof SQLInvalidAuthorizationSpecException) {`
`109`		`- return new PermissionDeniedDataAccessException(buildMessage(task, sql, sqlEx), sqlEx);`
	`109`	`+ return new PermissionDeniedDataAccessException(buildMessage(task, sql, sqlEx), ex);`
`110`	`110`	`}`
`111`	`111`	`if (sqlEx instanceof SQLSyntaxErrorException) {`
`112`		`- return new BadSqlGrammarException(task, (sql != null ? sql : ""), sqlEx);`
	`112`	`+ return new BadSqlGrammarException(task, (sql != null ? sql : ""), ex);`
`113`	`113`	`}`
`114`	`114`	`if (sqlEx instanceof SQLFeatureNotSupportedException) {`
`115`		`- return new InvalidDataAccessApiUsageException(buildMessage(task, sql, sqlEx), sqlEx);`
	`115`	`+ return new InvalidDataAccessApiUsageException(buildMessage(task, sql, sqlEx), ex);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`else if (sqlEx instanceof SQLRecoverableException) {`
`119`		`- return new RecoverableDataAccessException(buildMessage(task, sql, sqlEx), sqlEx);`
	`119`	`+ return new RecoverableDataAccessException(buildMessage(task, sql, sqlEx), ex);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`// Fallback to Spring's own SQL state translation...`
Original file line number	Diff line number	Diff line change
`@@ -131,35 +131,35 @@ public class SQLStateSQLExceptionTranslator extends AbstractFallbackSQLException`
`131`	`131`	`logger.debug("Extracted SQL state class '" + classCode + "' from value '" + sqlState + "'");`
`132`	`132`	`}`
`133`	`133`	`if (BAD_SQL_GRAMMAR_CODES.contains(classCode)) {`
`134`		`- return new BadSqlGrammarException(task, (sql != null ? sql : ""), sqlEx);`
	`134`	`+ return new BadSqlGrammarException(task, (sql != null ? sql : ""), ex);`
`135`	`135`	`}`
`136`	`136`	`else if (DATA_INTEGRITY_VIOLATION_CODES.contains(classCode)) {`
`137`	`137`	`if (indicatesDuplicateKey(sqlState, sqlEx.getErrorCode())) {`
`138`		`- return new DuplicateKeyException(buildMessage(task, sql, sqlEx), sqlEx);`
	`138`	`+ return new DuplicateKeyException(buildMessage(task, sql, sqlEx), ex);`
`139`	`139`	`}`
`140`		`- return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), sqlEx);`
	`140`	`+ return new DataIntegrityViolationException(buildMessage(task, sql, sqlEx), ex);`
`141`	`141`	`}`
`142`	`142`	`else if (PESSIMISTIC_LOCKING_FAILURE_CODES.contains(classCode)) {`
`143`	`143`	`if (indicatesCannotAcquireLock(sqlState)) {`
`144`		`- return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), sqlEx);`
	`144`	`+ return new CannotAcquireLockException(buildMessage(task, sql, sqlEx), ex);`
`145`	`145`	`}`
`146`		`- return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), sqlEx);`
	`146`	`+ return new PessimisticLockingFailureException(buildMessage(task, sql, sqlEx), ex);`
`147`	`147`	`}`
`148`	`148`	`else if (DATA_ACCESS_RESOURCE_FAILURE_CODES.contains(classCode)) {`
`149`	`149`	`if (indicatesQueryTimeout(sqlState)) {`
`150`		`- return new QueryTimeoutException(buildMessage(task, sql, sqlEx), sqlEx);`
	`150`	`+ return new QueryTimeoutException(buildMessage(task, sql, sqlEx), ex);`
`151`	`151`	`}`
`152`		`- return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), sqlEx);`
	`152`	`+ return new DataAccessResourceFailureException(buildMessage(task, sql, sqlEx), ex);`
`153`	`153`	`}`
`154`	`154`	`else if (TRANSIENT_DATA_ACCESS_RESOURCE_CODES.contains(classCode)) {`
`155`		`- return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), sqlEx);`
	`155`	`+ return new TransientDataAccessResourceException(buildMessage(task, sql, sqlEx), ex);`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`// For MySQL: exception class name indicating a timeout?`
`160`	`160`	`// (since MySQL doesn't throw the JDBC 4 SQLTimeoutException)`
`161`	`161`	`if (sqlEx.getClass().getName().contains("Timeout")) {`
`162`		`- return new QueryTimeoutException(buildMessage(task, sql, sqlEx), sqlEx);`
	`162`	`+ return new QueryTimeoutException(buildMessage(task, sql, sqlEx), ex);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`// Couldn't resolve anything proper - resort to UncategorizedSQLException.`
Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,7 @@ private void assertTranslation(SQLException ex, @Nullable Class<?> dataAccessExc`
`181`	`181`	`static void assertTranslation(DataAccessException dae, SQLException ex, Class<?> dataAccessExceptionType) {`
`182`	`182`	`assertThat(dae).as("Specific translation must not result in null").isNotNull();`
`183`	`183`	`assertThat(dae).as("Wrong DataAccessException type returned").isExactlyInstanceOf(dataAccessExceptionType);`
`184`		`- assertThat(dae.getCause()).as("The exact same original SQLException must be preserved").isSameAs(`
`185`		`- ex instanceof BatchUpdateException bue ? bue.getNextException() : ex);`
	`184`	`+ assertThat(dae.getCause()).as("The exact same original SQLException must be preserved").isSameAs(ex);`
`186`	`185`	`}`
`187`	`186`
`188`	`187`	`static BatchUpdateException buildBatchUpdateException(@Nullable String sqlState, SQLException next) {`