HHH-19300 constraint interpretation improvements for Db2

gavinking · gavinking · commit 1f5b18de67c7 · 2025-03-30T12:20:46.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -1123,7 +1123,15 @@ public void appendBinaryLiteral(SqlAppender appender, byte[] bytes) {
 	public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 		return new TemplatedViolatedConstraintNameExtractor(
 				sqle -> switch ( extractErrorCode( sqle ) ) {
-					case -803 -> extractUsingTemplate( "SQLERRMC=1;", ",", sqle.getMessage() );
+					case -803 -> {
+						// Unique constraint
+						final String constraintWithKind = extractUsingTemplate( "SQLERRMC=", ",", sqle.getMessage() );
+						// strip off "1;" for PK, or "2;" for other UK
+						yield constraintWithKind == null ? null : constraintWithKind.substring(2);
+					}
+					case -543, -545, -530,-531 ->
+						// Foreign key or check constraint
+							extractUsingTemplate( "SQLERRMC=", ",", sqle.getMessage() );
 					default -> null;
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest.java
@@ -13,6 +13,7 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.MariaDBDialect;
@@ -42,6 +43,7 @@
 @RequiresDialect( SQLServerDialect.class )
 @RequiresDialect( SybaseASEDialect.class )
 @RequiresDialect( OracleDialect.class )
+@RequiresDialect( DB2Dialect.class )
 @SkipForDialect(dialectClass = MariaDBDialect.class) // Maria doesn't allow named column-level check constraints
 public class ConstraintInterpretationTest {
 	@Test void testNotNullPrimaryKey(EntityManagerFactoryScope scope) {
@@ -52,7 +54,9 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
+				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
+				}
 			}
 		} );
 	}
@@ -76,7 +80,9 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
+				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
+				}
 			}
 		} );
 	}
@@ -89,7 +95,9 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
+				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
+				}
 			}
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest2.java
@@ -13,6 +13,7 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.MySQLDialect;
@@ -39,6 +40,7 @@
 @RequiresDialect( SQLServerDialect.class )
 @RequiresDialect( SybaseASEDialect.class )
 @RequiresDialect( OracleDialect.class )
+@RequiresDialect( DB2Dialect.class )
 public class ConstraintInterpretationTest2 {
 	@Test void testNotNullPrimaryKey(EntityManagerFactoryScope scope) {
 		scope.inTransaction( em -> {
@@ -48,7 +50,9 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
+				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
+				}
 			}
 		} );
 	}
@@ -72,7 +76,9 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
+				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
+				}
 			}
 		} );
 	}
@@ -85,7 +91,9 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
+				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
+				}
 			}
 		} );
 	}

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import jakarta.persistence.ManyToOne;`
`14`	`14`	`import jakarta.persistence.Table;`
`15`	`15`	`import jakarta.persistence.UniqueConstraint;`
	`16`	`+import org.hibernate.dialect.DB2Dialect;`
`16`	`17`	`import org.hibernate.dialect.H2Dialect;`
`17`	`18`	`import org.hibernate.dialect.HSQLDialect;`
`18`	`19`	`import org.hibernate.dialect.MariaDBDialect;`
`@@ -42,6 +43,7 @@`
`42`	`43`	`@RequiresDialect( SQLServerDialect.class )`
`43`	`44`	`@RequiresDialect( SybaseASEDialect.class )`
`44`	`45`	`@RequiresDialect( OracleDialect.class )`
	`46`	`+@RequiresDialect( DB2Dialect.class )`
`45`	`47`	`@SkipForDialect(dialectClass = MariaDBDialect.class) // Maria doesn't allow named column-level check constraints`
`46`	`48`	`public class ConstraintInterpretationTest {`
`47`	`49`	`@Test void testNotNullPrimaryKey(EntityManagerFactoryScope scope) {`
`@@ -52,7 +54,9 @@ public class ConstraintInterpretationTest {`
`52`	`54`	`}`
`53`	`55`	`catch (ConstraintViolationException cve) {`
`54`	`56`	`assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );`
`55`		`- assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );`
	`57`	`+ if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
	`58`	`+ assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );`
	`59`	`+ }`
`56`	`60`	`}`
`57`	`61`	`} );`
`58`	`62`	`}`
`@@ -76,7 +80,9 @@ public class ConstraintInterpretationTest {`
`76`	`80`	`}`
`77`	`81`	`catch (ConstraintViolationException cve) {`
`78`	`82`	`assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );`
`79`		`- assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );`
	`83`	`+ if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
	`84`	`+ assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );`
	`85`	`+ }`
`80`	`86`	`}`
`81`	`87`	`} );`
`82`	`88`	`}`
`@@ -89,7 +95,9 @@ public class ConstraintInterpretationTest {`
`89`	`95`	`}`
`90`	`96`	`catch (ConstraintViolationException cve) {`
`91`	`97`	`assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );`
`92`		`- assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );`
	`98`	`+ if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
	`99`	`+ assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );`
	`100`	`+ }`
`93`	`101`	`}`
`94`	`102`	`} );`
`95`	`103`	`}`