rework handling of check constraint 'options' on SQL Server

Author: gavinking

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java

@@ -51,7 +51,6 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Column;
@@ -98,6 +97,8 @@
 import jakarta.persistence.TemporalType;
 
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
+import static org.hibernate.internal.util.StringHelper.isBlank;
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.query.common.TemporalUnit.NANOSECOND;
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER;
 import static org.hibernate.type.SqlTypes.*;
@@ -1234,19 +1235,22 @@ public boolean supportsFromClauseInUpdate() {
 
 	@Override
 	public String getCheckConstraintString(CheckConstraint checkConstraint) {
+		// The only useful option is 'NOT FOR REPLICATION'
+		// and it comes before the constraint expression
 		final String constraintName = checkConstraint.getName();
-		return constraintName == null
-				?
-				" check " + getCheckConstraintOptions( checkConstraint ) + "(" + checkConstraint.getConstraint() + ")"
-				:
-				" constraint " + constraintName + " check " + getCheckConstraintOptions( checkConstraint ) + "(" + checkConstraint.getConstraint() + ")";
+		final String checkWithName =
+				isBlank( constraintName )
+						? " check"
+						: " constraint " + constraintName + " check";
+		return appendCheckConstraintOptions( checkConstraint, checkWithName )
+			+ " (" + checkConstraint.getConstraint() + ")";
 	}
 
-	private String getCheckConstraintOptions(CheckConstraint checkConstraint) {
-		if ( StringHelper.isNotEmpty( checkConstraint.getOptions() ) ) {
-			return checkConstraint.getOptions() + " ";
-		}
-		return "";
+	@Override
+	public String appendCheckConstraintOptions(CheckConstraint checkConstraint, String sqlCheckConstraint) {
+		return isNotEmpty( checkConstraint.getOptions() )
+				? sqlCheckConstraint + " " + checkConstraint.getOptions()
+				: sqlCheckConstraint;
 	}
 
 	@Override

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

@@ -10,6 +10,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.HibernateException;
 import org.hibernate.Incubating;
+import org.hibernate.Internal;
 import org.hibernate.Length;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
@@ -6031,36 +6032,46 @@ public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSuppor
 	 */
 	public String getCheckConstraintString(CheckConstraint checkConstraint) {
 		final String constraintName = checkConstraint.getName();
-		final String constraint = isBlank( constraintName )
-				? " check (" + checkConstraint.getConstraint() + ")"
-				: " constraint " + constraintName + " check (" + checkConstraint.getConstraint() + ")";
+		final String checkWithName =
+				isBlank( constraintName )
+						? " check"
+						: " constraint " + constraintName + " check";
+		final String constraint = checkWithName + " (" + checkConstraint.getConstraint() + ")";
 		return appendCheckConstraintOptions( checkConstraint, constraint );
 	}
 
 	/**
-	 * Append the {@link CheckConstraint} options to SQL check sqlCheckConstraint
+	 * Append the {@linkplain CheckConstraint#getOptions() options} to the given DDL
+	 * string declaring a SQL {@code check} constraint.
 	 *
 	 * @param checkConstraint an instance of {@link CheckConstraint}
 	 * @param sqlCheckConstraint the SQL to append the {@link CheckConstraint} options
 	 *
 	 * @return a SQL expression
+	 *
+	 * @since 7.0
 	 */
+	@Internal @Incubating
 	public String appendCheckConstraintOptions(CheckConstraint checkConstraint, String sqlCheckConstraint) {
 		return sqlCheckConstraint;
 	}
 
 	/**
-	 * Does this dialect support appending table options SQL fragment at the end of the SQL Table creation statement?
+	 * Does this dialect support appending table options SQL fragment at the end of the SQL table creation statement?
 	 *
 	 * @return {@code true} indicates it does; {@code false} indicates it does not;
+	 *
+	 * @since 7.0
 	 */
+	@Deprecated(since = "7.1", forRemoval = true)
 	public boolean supportsTableOptions() {
 		return false;
 	}
 
 	/**
 	 * Does this dialect support binding {@link Types#NULL} for {@link PreparedStatement#setNull(int, int)}?
-	 * if it does, then call of {@link PreparedStatement#getParameterMetaData()} could be eliminated for better performance.
+	 * If it does, then the call to {@link PreparedStatement#getParameterMetaData()} may be skipped for
+	 * better performance.
 	 *
 	 * @return {@code true} indicates it does; {@code false} indicates it does not;
 	 * @see org.hibernate.type.descriptor.jdbc.ObjectNullResolvingJdbcType

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

@@ -1219,16 +1219,22 @@ public CallableStatementSupport getCallableStatementSupport() {
 
 	@Override
 	public String getCheckConstraintString(CheckConstraint checkConstraint) {
+		// The only useful option is 'NOT FOR REPLICATION'
+		// and it comes before the constraint expression
 		final String constraintName = checkConstraint.getName();
-		return isBlank( constraintName )
-				? " check " + getCheckConstraintOptions( checkConstraint )
-						+ "(" + checkConstraint.getConstraint() + ")"
-				: " constraint " + constraintName + " check " + getCheckConstraintOptions( checkConstraint )
-						+ "(" + checkConstraint.getConstraint() + ")";
+		final String checkWithName =
+				isBlank( constraintName )
+						? " check"
+						: " constraint " + constraintName + " check";
+		return appendCheckConstraintOptions( checkConstraint, checkWithName )
+			+ " (" + checkConstraint.getConstraint() + ")";
 	}
 
-	private String getCheckConstraintOptions(CheckConstraint checkConstraint) {
-		return isNotEmpty( checkConstraint.getOptions() ) ? checkConstraint.getOptions() + " " : "";
+	@Override
+	public String appendCheckConstraintOptions(CheckConstraint checkConstraint, String sqlCheckConstraint) {
+		return isNotEmpty( checkConstraint.getOptions() )
+				? sqlCheckConstraint + " " + checkConstraint.getOptions()
+				: sqlCheckConstraint;
 	}
 
 	@Override