HHH-19300 constraint interpretation improvements for HANA

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java

@@ -39,11 +39,11 @@
 import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.exception.ConstraintViolationException.ConstraintKind;
 import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
@@ -126,6 +126,7 @@
 import java.util.regex.Pattern;
 
 import static org.hibernate.dialect.HANAServerConfiguration.MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE;
+import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode;
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.BOOLEAN;
@@ -587,59 +588,49 @@ public String extractPattern(TemporalUnit unit) {
 
 	@Override
 	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-		return (sqlException, message, sql) -> {
-			final int errorCode = JdbcExceptionHelper.extractErrorCode( sqlException );
-
-			if ( errorCode == 131 ) {
-				// 131 - Transaction rolled back by lock wait timeout
-				return new LockTimeoutException( message, sqlException, sql );
-			}
-
-			if ( errorCode == 146 ) {
-				// 146 - Resource busy and acquire with NOWAIT specified
-				return new LockTimeoutException( message, sqlException, sql );
-			}
-
-			if ( errorCode == 132 ) {
-				// 132 - Transaction rolled back due to unavailable resource
-				return new LockAcquisitionException( message, sqlException, sql );
-			}
-
-			if ( errorCode == 133 ) {
-				// 133 - Transaction rolled back by detected deadlock
-				return new LockAcquisitionException( message, sqlException, sql );
-			}
-
-			// 259 - Invalid table name
-			// 260 - Invalid column name
-			// 261 - Invalid index name
-			// 262 - Invalid query name
-			// 263 - Invalid alias name
-			if ( errorCode == 257 || ( errorCode >= 259 && errorCode <= 263 ) ) {
-				return new SQLGrammarException( message, sqlException, sql );
-			}
-
-			// 257 - Cannot insert NULL or update to NULL
-			// 301 - Unique constraint violated
-			// 461 - foreign key constraint violation
-			// 462 - failed on update or delete by foreign key constraint violation
-			if ( errorCode == 287 || errorCode == 301 || errorCode == 461 || errorCode == 462 ) {
-				final String constraintName = getViolatedConstraintNameExtractor()
-						.extractConstraintName( sqlException );
-
-				return new ConstraintViolationException(
-						message,
-						sqlException,
-						sql,
-						errorCode == 301
-								? ConstraintViolationException.ConstraintKind.UNIQUE
-								: ConstraintViolationException.ConstraintKind.OTHER,
-						constraintName
-				);
-			}
-
-			return null;
-		};
+		return (sqlException, message, sql) ->
+				switch ( extractErrorCode( sqlException ) ) {
+					case 131 ->
+						// 131 - Transaction rolled back by lock wait timeout
+							new LockTimeoutException( message, sqlException, sql );
+					case 146 ->
+						// 146 - Resource busy and acquire with NOWAIT specified
+							new LockTimeoutException( message, sqlException, sql );
+					case 132 ->
+						// 132 - Transaction rolled back due to unavailable resource
+							new LockAcquisitionException( message, sqlException, sql );
+					case 133 ->
+						// 133 - Transaction rolled back by detected deadlock
+							new LockAcquisitionException( message, sqlException, sql );
+					case 257, 259, 260, 261, 262, 263 ->
+						// 259 - Invalid table name
+						// 260 - Invalid column name
+						// 261 - Invalid index name
+						// 262 - Invalid query name
+						// 263 - Invalid alias name
+							new SQLGrammarException( message, sqlException, sql );
+					case 301 ->
+						// 301 - Unique constraint violated
+							new ConstraintViolationException( message, sqlException, sql, ConstraintKind.UNIQUE,
+									getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+					case 287 ->
+						// 287 - Cannot insert NULL or update to NULL
+							new ConstraintViolationException( message, sqlException, sql, ConstraintKind.NOT_NULL,
+									getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+					case 461, 462 ->
+						// 257 - Cannot insert NULL or update to NULL
+						// 301 - Unique constraint violated
+						// 461 - foreign key constraint violation
+						// 462 - failed on update or delete by foreign key constraint violation
+							new ConstraintViolationException( message, sqlException, sql, ConstraintKind.FOREIGN_KEY,
+									getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+					case 677 ->
+						// 677 - Check constraint violation
+							new ConstraintViolationException( message, sqlException, sql, ConstraintKind.CHECK,
+									getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+
+					default -> null;
+				};
 	}
 
 	@Override

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.community.dialect.DerbyDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HSQLDialect;
@@ -44,6 +45,7 @@
 @RequiresDialect( SybaseASEDialect.class )
 @RequiresDialect( OracleDialect.class )
 @RequiresDialect( DB2Dialect.class )
+@RequiresDialect( DerbyDialect.class )
 @SkipForDialect(dialectClass = MariaDBDialect.class) // Maria doesn't allow named column-level check constraints
 public class ConstraintInterpretationTest {
 	@Test void testNotNullPrimaryKey(EntityManagerFactoryScope scope) {