HHH-19300 constraint interpretation improvements for Postgres and MySQL

Author: gavinking

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

@@ -970,15 +970,12 @@ public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 	}
 
 	private static final ViolatedConstraintNameExtractor EXTRACTOR =
-			new TemplatedViolatedConstraintNameExtractor( sqle -> {
-				final String sqlState = extractSqlState( sqle );
-				if ( sqlState != null ) {
-					return switch ( parseInt( sqlState ) ) {
-						case 23000 -> extractUsingTemplate( " for key '", "'", sqle.getMessage() );
-						default -> null;
-					};
-				}
-				return null;
+			new TemplatedViolatedConstraintNameExtractor( sqle -> switch ( sqle.getErrorCode() ) {
+				case 1062 -> extractUsingTemplate( " for key '", "'", sqle.getMessage() );
+				case 1451, 1452 -> extractUsingTemplate( " CONSTRAINT `", "`", sqle.getMessage() );
+				case 3819-> extractUsingTemplate( " constraint '", "'", sqle.getMessage() );
+				case 1048 -> extractUsingTemplate( "Column '", "'", sqle.getMessage() );
+				default -> null;
 			} );
 
 	@Override
@@ -1259,15 +1256,18 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 				case 1048:
 					// Null constraint violation
 					return new ConstraintViolationException( message, sqlException, sql,
-							ConstraintViolationException.ConstraintKind.NOT_NULL, null );
+							ConstraintViolationException.ConstraintKind.NOT_NULL,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
 				case 1451, 1452:
 					// Foreign key constraint violation
 					return new ConstraintViolationException( message, sqlException, sql,
-							ConstraintViolationException.ConstraintKind.FOREIGN_KEY, null );
+							ConstraintViolationException.ConstraintKind.FOREIGN_KEY,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
 				case 3819:
 					// Check constraint violation
 					return new ConstraintViolationException( message, sqlException, sql,
-							ConstraintViolationException.ConstraintKind.CHECK, null );
+							ConstraintViolationException.ConstraintKind.CHECK,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
 			}
 
 			final String sqlState = extractSqlState( sqlException );

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

@@ -49,7 +49,6 @@
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
-import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -105,7 +104,9 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.TemporalType;
 
+import static java.lang.Integer.parseInt;
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
+import static org.hibernate.internal.util.JdbcExceptionHelper.extractSqlState;
 import static org.hibernate.query.common.TemporalUnit.DAY;
 import static org.hibernate.query.common.TemporalUnit.EPOCH;
 import static org.hibernate.type.SqlTypes.ARRAY;
@@ -1019,37 +1020,25 @@ public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 	 */
 	private static final ViolatedConstraintNameExtractor EXTRACTOR =
 			new TemplatedViolatedConstraintNameExtractor( sqle -> {
-				final String sqlState = JdbcExceptionHelper.extractSqlState( sqle );
+				final String sqlState = extractSqlState( sqle );
 				if ( sqlState != null ) {
-					switch ( Integer.parseInt( sqlState ) ) {
-						// CHECK VIOLATION
-						case 23514:
-							return extractUsingTemplate( "violates check constraint \"", "\"", sqle.getMessage() );
-						// UNIQUE VIOLATION
-						case 23505:
-							return extractUsingTemplate( "violates unique constraint \"", "\"", sqle.getMessage() );
-						// FOREIGN KEY VIOLATION
-						case 23503:
-							return extractUsingTemplate( "violates foreign key constraint \"", "\"", sqle.getMessage() );
-						// NOT NULL VIOLATION
-						case 23502:
-							return extractUsingTemplate(
-									"null value in column \"",
-									"\" violates not-null constraint",
-									sqle.getMessage()
-							);
-						// TODO: RESTRICT VIOLATION
-						case 23001:
-							return null;
-					}
+					return switch ( parseInt( sqlState ) ) {
+						case 23505, 23514, 23503 ->
+							// UNIQUE, CHECK, OR FOREIGN KEY VIOLATION
+								extractUsingTemplate( "constraint \"", "\"", sqle.getMessage() );
+						case 23502 ->
+							// NOT NULL VIOLATION
+								extractUsingTemplate( "column \"", "\"", sqle.getMessage() );
+						default -> null;
+					};
 				}
 				return null;
 			} );
 
 	@Override
 	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 		return (sqlException, message, sql) -> {
-			final String sqlState = JdbcExceptionHelper.extractSqlState( sqlException );
+			final String sqlState = extractSqlState( sqlException );
 			if ( sqlState != null ) {
 				switch ( sqlState ) {
 					case "40P01":