HHH-19260 - Move supportsRowValueConstructorDistinctFromSyntax() to Dialect

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

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

@@ -1090,4 +1090,10 @@ public boolean supportsRowValueConstructorSyntax() {
 		return getVersion().isSameOrAfter( 1, 4, 197 );
 	}
 
+	@Override
+	public boolean supportsRowValueConstructorDistinctFromSyntax() {
+		// Seems that before, this was buggy
+		return getVersion().isSameOrAfter( 1, 4, 200 );
+	}
+
 }

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

@@ -358,12 +358,6 @@ protected boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
 		return getDialect().getVersion().isSameOrAfter( 1, 4, 197 );
 	}
 
-	@Override
-	protected boolean supportsRowValueConstructorDistinctFromSyntax() {
-		// Seems that before, this was buggy
-		return getDialect().getVersion().isSameOrAfter( 1, 4, 200 );
-	}
-
 	protected boolean allowsNullPrecedence() {
 		return getClauseStack().getCurrent() != Clause.WITHIN_GROUP || getDialect().supportsNullPrecedence();
 	}

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

@@ -5984,4 +5984,19 @@ public boolean supportsRowValueConstructorGtLtSyntax() {
 		return supportsRowValueConstructorSyntax();
 	}
 
+	/**
+	 * Is this dialect known to support what ANSI-SQL terms "row value
+	 * constructor" syntax; sometimes called tuple syntax with <code>is distinct from</code>
+	 * and <code>is not distinct from</code> operators.
+	 * <p>
+	 * Basically, does it support syntax like
+	 * {@code ... where (FIRST_NAME, LAST_NAME) is distinct from ('Steve', 'Ebersole') ...}
+	 *
+	 * @return True if this SQL dialect is known to support "row value
+	 * constructor" syntax with distinct from comparison operators; false otherwise.
+	 */
+	public boolean supportsRowValueConstructorDistinctFromSyntax() {
+		return supportsRowValueConstructorSyntax() && supportsDistinctFromPredicate();
+	}
+
 }

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

@@ -1110,4 +1110,9 @@ public boolean supportsRowValueConstructorSyntax() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsRowValueConstructorDistinctFromSyntax() {
+		return true;
+	}
+
 }

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

@@ -331,11 +331,6 @@ protected boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
 		return true;
 	}
 
-	@Override
-	protected boolean supportsRowValueConstructorDistinctFromSyntax() {
-		return true;
-	}
-
 	private boolean supportsOffsetFetchClause() {
 		return true;
 	}

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java

@@ -6456,7 +6456,7 @@ protected Predicate determineLateralEmulationPredicate(TableGroup tableGroup) {
 
 			// The following optimization only makes sense if the necessary features are supported natively
 			if ( ( columnReferences.size() == 1 || dialect.supportsRowValueConstructorSyntax() )
-					&& supportsRowValueConstructorDistinctFromSyntax() ) {
+					&& dialect.supportsRowValueConstructorDistinctFromSyntax() ) {
 				// Special case for limit 1 sub-queries to avoid double nested sub-query
 				// ... x(c) on x.c is not distinct from (... fetch first 1 rows only)
 				if ( isFetchFirstRowOnly( statement.getQueryPart() ) ) {
@@ -8415,26 +8415,11 @@ private boolean needsTupleComparisonEmulation(ComparisonOperator operator) {
 			case LESS_THAN, LESS_THAN_OR_EQUAL, GREATER_THAN, GREATER_THAN_OR_EQUAL ->
 					!dialect.supportsRowValueConstructorGtLtSyntax();
 			case DISTINCT_FROM, NOT_DISTINCT_FROM ->
-					!supportsRowValueConstructorDistinctFromSyntax();
+					!dialect.supportsRowValueConstructorDistinctFromSyntax();
 			default -> false;
 		};
 	}
 
-	/**
-	 * Is this dialect known to support what ANSI-SQL terms "row value
-	 * constructor" syntax; sometimes called tuple syntax with <code>is distinct from</code>
-	 * and <code>is not distinct from</code> operators.
-	 * <p>
-	 * Basically, does it support syntax like
-	 * {@code ... where (FIRST_NAME, LAST_NAME) is distinct from ('Steve', 'Ebersole') ...}
-	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax with distinct from comparison operators; false otherwise.
-	 */
-	protected boolean supportsRowValueConstructorDistinctFromSyntax() {
-		return dialect.supportsRowValueConstructorSyntax() && dialect.supportsDistinctFromPredicate();
-	}
-
 	/**
 	 * Is this dialect known to support what ANSI-SQL terms "row value
 	 * constructor" syntax; sometimes called tuple syntax with quantified predicates.