spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-09-05 14:52:07 +02:00
parent 42fe29218b 6e260bc78e
commit e74054be0a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class SQLErrorCodes {
}
public void setDuplicateKeyCodes(String... duplicateKeyCodes) {
this.duplicateKeyCodes = duplicateKeyCodes;
this.duplicateKeyCodes = StringUtils.sortStringArray(duplicateKeyCodes);
}
public void setDataIntegrityViolationCodes(String... dataIntegrityViolationCodes) {
spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
+14
View File
@@ -107,6 +107,20 @@ class SQLErrorCodeSQLExceptionTranslatorTests {
.hasCause(sqlException);
}
@Test // gh-37235
void duplicateKeyCodesDeclaredInUnsortedOrder() {
SQLErrorCodes errorCodes = new SQLErrorCodes();
errorCodes.setDuplicateKeyCodes("90002", "1586", "1062");
SQLErrorCodeSQLExceptionTranslator unsortedCodesTranslator = new SQLErrorCodeSQLExceptionTranslator(errorCodes);
for (int errorCode : new int[] {90002, 1586, 1062}) {
SQLException sqlException = new SQLException("", "", errorCode);
assertThat(unsortedCodesTranslator.translate("task", "SQL", sqlException))
.isInstanceOf(DuplicateKeyException.class)
.hasCause(sqlException);
}
}
@Test
void batchExceptionTranslation() {
SQLException badSqlEx = new SQLException("", "", 1);