Skip some constraint violation name check for HANA and CockroachDB and improve Informix constraint reporting

beikov · beikov · commit 47db687e4dac · 2025-08-22T10:17:55.000+02:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java
@@ -39,6 +39,7 @@
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
+import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.sqm.IntervalType;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
@@ -112,6 +113,7 @@
 
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
 import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode;
+import static org.hibernate.internal.util.StringHelper.isBlank;
 import static org.hibernate.query.common.TemporalUnit.DAY;
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.STRING;
 import static org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers.impliedOrInvariant;
@@ -605,11 +607,22 @@ public boolean supportsIfExistsBeforeConstraintName() {
 	}
 
 	@Override
-	public boolean supportsTableCheck() {
-		// multi-column check constraints are created using 'alter table'
+	public boolean supportsNamedColumnCheck() {
+		// It seems the constraint name is ignored on column level
 		return false;
 	}
 
+	@Override
+	public String getCheckConstraintString(CheckConstraint checkConstraint) {
+		final String constraintName = checkConstraint.getName();
+		final String constraint = " check (" + checkConstraint.getConstraint() + ")";
+		final String constraintWithName =
+				isBlank( constraintName )
+						? constraint
+						: constraint + " constraint " + constraintName;
+		return appendCheckConstraintOptions( checkConstraint, constraintWithName );
+	}
+
 	@Override
 	public String getCascadeConstraintsString() {
 		return getVersion().isSameOrAfter( 12, 10 )
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
@@ -14,7 +14,9 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.dialect.HANADialect;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
@@ -36,6 +38,7 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
+				// DB2 and Informix error messages don't contain the primary key constraint name
 				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
 				}
@@ -62,6 +65,7 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
+				// DB2 error message doesn't contain constraint or column name
 				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
 				}
@@ -77,6 +81,7 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );
+				// DB2 error message doesn't contain unique constraint name
 				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
 				}
@@ -91,7 +96,8 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.CHECK, cve.getKind() );
-				if ( !(scope.getDialect() instanceof InformixDialect) ) {
+				// CockroachDB error messages don't contain the check constraint name
+				if ( !(scope.getDialect() instanceof CockroachDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );
 				}
 			}
@@ -105,7 +111,10 @@ public class ConstraintInterpretationTest {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.FOREIGN_KEY, cve.getKind() );
-				assertTrue(  cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );
+				// HANA error messages don't contain the foreign key constraint name
+				if ( !(scope.getDialect() instanceof HANADialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );
+				}
 			}
 		} );
 	}
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
@@ -14,12 +14,12 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,6 +37,7 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
+				// DB2 and Informix error messages don't contain the primary key constraint name
 				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
 				}
@@ -63,6 +64,7 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
+				// DB2 error message doesn't contain constraint or column name
 				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
 				}
@@ -78,15 +80,14 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );
+				// DB2 error message doesn't contain unique constraint name
 				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
 				}
 			}
 		} );
 	}
 
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "multi-column check constraints must be created using 'alter table', and we don't have a StandardCheckConstraintExporter")
 	@Test void testCheck(EntityManagerFactoryScope scope) {
 		scope.inTransaction( em -> {
 			try {
@@ -95,7 +96,10 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.CHECK, cve.getKind() );
-				assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );
+				// CockroachDB error messages don't contain the check constraint name
+				if ( !(scope.getDialect() instanceof CockroachDialect) ) {
+					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );
+				}
 			}
 		} );
 	}
@@ -107,6 +111,7 @@ public class ConstraintInterpretationTest2 {
 			}
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.FOREIGN_KEY, cve.getKind() );
+				// HANA error messages don't contain the foreign key constraint name
 				if ( !(scope.getDialect() instanceof HANADialect) ) {
 					assertTrue(  cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );
 				}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@`
`14`	`14`	`import jakarta.persistence.Table;`
`15`	`15`	`import jakarta.persistence.UniqueConstraint;`
`16`	`16`	`import org.hibernate.community.dialect.InformixDialect;`
	`17`	`+import org.hibernate.dialect.CockroachDialect;`
`17`	`18`	`import org.hibernate.dialect.DB2Dialect;`
	`19`	`+import org.hibernate.dialect.HANADialect;`
`18`	`20`	`import org.hibernate.exception.ConstraintViolationException;`
`19`	`21`	`import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;`
`20`	`22`	`import org.hibernate.testing.orm.junit.Jpa;`
`@@ -36,6 +38,7 @@ public class ConstraintInterpretationTest {`
`36`	`38`	`}`
`37`	`39`	`catch (ConstraintViolationException cve) {`
`38`	`40`	`assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );`
	`41`	`+ // DB2 and Informix error messages don't contain the primary key constraint name`
`39`	`42`	`if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) ) {`
`40`	`43`	`assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );`
`41`	`44`	`}`
`@@ -62,6 +65,7 @@ public class ConstraintInterpretationTest {`
`62`	`65`	`}`
`63`	`66`	`catch (ConstraintViolationException cve) {`
`64`	`67`	`assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );`
	`68`	`+ // DB2 error message doesn't contain constraint or column name`
`65`	`69`	`if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
`66`	`70`	`assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );`
`67`	`71`	`}`
`@@ -77,6 +81,7 @@ public class ConstraintInterpretationTest {`
`77`	`81`	`}`
`78`	`82`	`catch (ConstraintViolationException cve) {`
`79`	`83`	`assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );`
	`84`	`+ // DB2 error message doesn't contain unique constraint name`
`80`	`85`	`if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
`81`	`86`	`assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );`
`82`	`87`	`}`
`@@ -91,7 +96,8 @@ public class ConstraintInterpretationTest {`
`91`	`96`	`}`
`92`	`97`	`catch (ConstraintViolationException cve) {`
`93`	`98`	`assertEquals( ConstraintViolationException.ConstraintKind.CHECK, cve.getKind() );`
`94`		`- if ( !(scope.getDialect() instanceof InformixDialect) ) {`
	`99`	`+ // CockroachDB error messages don't contain the check constraint name`
	`100`	`+ if ( !(scope.getDialect() instanceof CockroachDialect) ) {`
`95`	`101`	`assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );`
`96`	`102`	`}`
`97`	`103`	`}`
`@@ -105,7 +111,10 @@ public class ConstraintInterpretationTest {`
`105`	`111`	`}`
`106`	`112`	`catch (ConstraintViolationException cve) {`
`107`	`113`	`assertEquals( ConstraintViolationException.ConstraintKind.FOREIGN_KEY, cve.getKind() );`
`108`		`- assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );`
	`114`	`+ // HANA error messages don't contain the foreign key constraint name`
	`115`	`+ if ( !(scope.getDialect() instanceof HANADialect) ) {`
	`116`	`+ assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );`
	`117`	`+ }`
`109`	`118`	`}`
`110`	`119`	`} );`
`111`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@`
`14`	`14`	`import jakarta.persistence.Table;`
`15`	`15`	`import jakarta.persistence.UniqueConstraint;`
`16`	`16`	`import org.hibernate.community.dialect.InformixDialect;`
	`17`	`+import org.hibernate.dialect.CockroachDialect;`
`17`	`18`	`import org.hibernate.dialect.DB2Dialect;`
`18`	`19`	`import org.hibernate.dialect.HANADialect;`
`19`	`20`	`import org.hibernate.exception.ConstraintViolationException;`
`20`	`21`	`import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;`
`21`	`22`	`import org.hibernate.testing.orm.junit.Jpa;`
`22`		`-import org.hibernate.testing.orm.junit.SkipForDialect;`
`23`	`23`	`import org.junit.jupiter.api.Test;`
`24`	`24`
`25`	`25`	`import static org.junit.jupiter.api.Assertions.assertEquals;`
`@@ -37,6 +37,7 @@ public class ConstraintInterpretationTest2 {`
`37`	`37`	`}`
`38`	`38`	`catch (ConstraintViolationException cve) {`
`39`	`39`	`assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );`
	`40`	`+ // DB2 and Informix error messages don't contain the primary key constraint name`
`40`	`41`	`if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) ) {`
`41`	`42`	`assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );`
`42`	`43`	`}`
`@@ -63,6 +64,7 @@ public class ConstraintInterpretationTest2 {`
`63`	`64`	`}`
`64`	`65`	`catch (ConstraintViolationException cve) {`
`65`	`66`	`assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );`
	`67`	`+ // DB2 error message doesn't contain constraint or column name`
`66`	`68`	`if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
`67`	`69`	`assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );`
`68`	`70`	`}`
`@@ -78,15 +80,14 @@ public class ConstraintInterpretationTest2 {`
`78`	`80`	`}`
`79`	`81`	`catch (ConstraintViolationException cve) {`
`80`	`82`	`assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );`
	`83`	`+ // DB2 error message doesn't contain unique constraint name`
`81`	`84`	`if ( !(scope.getDialect() instanceof DB2Dialect) ) {`
`82`	`85`	`assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );`
`83`	`86`	`}`
`84`	`87`	`}`
`85`	`88`	`} );`
`86`	`89`	`}`
`87`	`90`
`88`		`- @SkipForDialect(dialectClass = InformixDialect.class,`
`89`		`- reason = "multi-column check constraints must be created using 'alter table', and we don't have a StandardCheckConstraintExporter")`
`90`	`91`	`@Test void testCheck(EntityManagerFactoryScope scope) {`
`91`	`92`	`scope.inTransaction( em -> {`
`92`	`93`	`try {`
`@@ -95,7 +96,10 @@ public class ConstraintInterpretationTest2 {`
`95`	`96`	`}`
`96`	`97`	`catch (ConstraintViolationException cve) {`
`97`	`98`	`assertEquals( ConstraintViolationException.ConstraintKind.CHECK, cve.getKind() );`
`98`		`- assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );`
	`99`	`+ // CockroachDB error messages don't contain the check constraint name`
	`100`	`+ if ( !(scope.getDialect() instanceof CockroachDialect) ) {`
	`101`	`+ assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );`
	`102`	`+ }`
`99`	`103`	`}`
`100`	`104`	`} );`
`101`	`105`	`}`
`@@ -107,6 +111,7 @@ public class ConstraintInterpretationTest2 {`
`107`	`111`	`}`
`108`	`112`	`catch (ConstraintViolationException cve) {`
`109`	`113`	`assertEquals( ConstraintViolationException.ConstraintKind.FOREIGN_KEY, cve.getKind() );`
	`114`	`+ // HANA error messages don't contain the foreign key constraint name`
`110`	`115`	`if ( !(scope.getDialect() instanceof HANADialect) ) {`
`111`	`116`	`assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );`
`112`	`117`	`}`