HHH-19260 - Remove supportsDistinctFromPredicate() from AbstractSqlAstTranslator (was already in Dialect)

jrenaat · jrenaat · commit c14322047429 · 2025-03-19T14:04:50.000+01:00
Signed-off-by: Jan Schatteman &lt;jschatte@redhat.com&gt;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
@@ -412,12 +412,6 @@ protected boolean supportsIntersect() {
 		return dialect.getVersion().isSameOrAfter( 10, 3 );
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		// It supports a proprietary operator
-		return true;
-	}
-
 	@Override
 	public MariaDBLegacyDialect getDialect() {
 		return this.dialect;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
@@ -1503,4 +1503,10 @@ public String getFromDualForSelectOnly() {
 		return getVersion().isSameOrAfter( 8 ) ? "" : ( " from " + getDual() );
 	}
 
+	@Override
+	public boolean supportsDistinctFromPredicate() {
+		// It supports a proprietary operator
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
@@ -389,12 +389,6 @@ protected boolean supportsIntersect() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		// It supports a proprietary operator
-		return true;
-	}
-
 	@Override
 	protected boolean supportsSimpleQueryGrouping() {
 		return getDialect().getVersion().isSameOrAfter( 8 );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java
@@ -493,11 +493,11 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 			// In SQL Server, XMLTYPE is not "comparable", so we have to cast the two parts to varchar for this purpose
 			switch ( operator ) {
 				case DISTINCT_FROM:
-					if ( !supportsDistinctFromPredicate() ) {
+					if ( !getDialect().supportsDistinctFromPredicate() ) {
 						appendSql( "not " );
 					}
 				case NOT_DISTINCT_FROM: {
-					if ( !supportsDistinctFromPredicate() ) {
+					if ( !getDialect().supportsDistinctFromPredicate() ) {
 						appendSql( "exists (select cast(" );
 						getClauseStack().push( Clause.SELECT );
 						visitSqlSelectExpression( lhs );
@@ -527,19 +527,14 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 					break;
 			}
 		}
-		if ( supportsDistinctFromPredicate() ) {
+		if ( getDialect().supportsDistinctFromPredicate() ) {
 			renderComparisonStandard( lhs, operator, rhs );
 		}
 		else {
 			renderComparisonEmulateIntersect( lhs, operator, rhs );
 		}
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		return getDialect().getVersion().isSameOrAfter( 16 );
-	}
-
 	@Override
 	protected void renderSelectTupleComparison(
 			List<SqlSelection> lhsExpressions,
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java
@@ -430,11 +430,6 @@ public boolean supportsRowValueConstructorSyntaxInSet() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		return false;
-	}
-
 	@Override
 	public SingleStoreDialect getDialect() {
 		return this.dialect;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java
@@ -423,7 +423,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 						break;
 				}
 			}
-			if ( supportsDistinctFromPredicate() ) {
+			if ( getDialect().supportsDistinctFromPredicate() ) {
 				renderComparisonEmulateIntersect( lhs, operator, rhs );
 			}
 			else {
@@ -482,7 +482,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 				}
 			}
 			else {
-				if ( supportsDistinctFromPredicate() ) {
+				if ( getDialect().supportsDistinctFromPredicate() ) {
 					renderComparisonEmulateIntersect( lhs, operator, rhs );
 				}
 				else {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
@@ -414,12 +414,6 @@ protected boolean supportsIntersect() {
 		return true;
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		// It supports a proprietary operator
-		return true;
-	}
-
 	@Override
 	public MariaDBDialect getDialect() {
 		return this.dialect;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
@@ -1596,4 +1596,11 @@ public boolean supportsBindingNullSqlTypeForSetNull() {
 	public String getDual() {
 		return "dual";
 	}
+
+	@Override
+	public boolean supportsDistinctFromPredicate() {
+		// It supports a proprietary operator
+		return true;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
@@ -449,12 +449,6 @@ protected boolean supportsIntersect() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		// It supports a proprietary operator
-		return true;
-	}
-
 	@Override
 	protected boolean supportsSimpleQueryGrouping() {
 		return true;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
@@ -464,11 +464,11 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 			// In SQL Server, XMLTYPE is not "comparable", so we have to cast the two parts to varchar for this purpose
 			switch ( operator ) {
 				case DISTINCT_FROM:
-					if ( !supportsDistinctFromPredicate() ) {
+					if ( !getDialect().supportsDistinctFromPredicate() ) {
 						appendSql( "not " );
 					}
 				case NOT_DISTINCT_FROM: {
-					if ( !supportsDistinctFromPredicate() ) {
+					if ( !getDialect().supportsDistinctFromPredicate() ) {
 						appendSql( "exists (select cast(" );
 						getClauseStack().push( Clause.SELECT );
 						visitSqlSelectExpression( lhs );
@@ -498,19 +498,14 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 					break;
 			}
 		}
-		if ( supportsDistinctFromPredicate() ) {
+		if ( getDialect().supportsDistinctFromPredicate() ) {
 			renderComparisonStandard( lhs, operator, rhs );
 		}
 		else {
 			renderComparisonEmulateIntersect( lhs, operator, rhs );
 		}
 	}
 
-	@Override
-	protected boolean supportsDistinctFromPredicate() {
-		return getDialect().getVersion().isSameOrAfter( 16 );
-	}
-
 	@Override
 	protected void renderSelectTupleComparison(
 			List<SqlSelection> lhsExpressions,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
@@ -432,7 +432,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 		}
 		// I think intersect is only supported in 16.0 SP3
 		if ( ansiNullOn ) {
-			if ( supportsDistinctFromPredicate() ) {
+			if ( getDialect().supportsDistinctFromPredicate() ) {
 				renderComparisonEmulateIntersect( lhs, operator, rhs );
 			}
 			else {
@@ -469,7 +469,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 				}
 			}
 			else {
-				if ( supportsDistinctFromPredicate() ) {
+				if ( getDialect().supportsDistinctFromPredicate() ) {
 					renderComparisonEmulateIntersect( lhs, operator, rhs );
 				}
 				else {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -6860,7 +6860,10 @@ private QuerySpec stripToSelectClause(QuerySpec querySpec) {
 	}
 
 	private boolean needsLateralSortExpressionVirtualSelections(QuerySpec querySpec) {
-		return !( ( querySpec.getSelectClause().getSqlSelections().size() == 1 || supportsRowValueConstructorSyntax() ) && supportsDistinctFromPredicate() && isFetchFirstRowOnly( querySpec ) )
+		return !( ( querySpec.getSelectClause().getSqlSelections().size() == 1
+				|| supportsRowValueConstructorSyntax() )
+				&& dialect.supportsDistinctFromPredicate()
+				&& isFetchFirstRowOnly( querySpec ) )
 				&& !shouldEmulateLateralWithIntersect( querySpec )
 				&& !supportsNestedSubqueryCorrelation()
 				&& querySpec.hasOffsetOrFetchClause();
@@ -8474,18 +8477,6 @@ protected boolean supportsQuantifiedPredicates() {
 		return true;
 	}
 
-	/**
-	 * Is this SQL dialect known to support some kind of distinct from predicate.
-	 * <p>
-	 * Basically, does it support syntax like
-	 * {@code ... where FIRST_NAME IS DISTINCT FROM LAST_NAME}
-	 *
-	 * @return True if this SQL dialect is known to support some kind of distinct from predicate; false otherwise
-	 */
-	protected boolean supportsDistinctFromPredicate() {
-		return dialect.supportsDistinctFromPredicate();
-	}
-
 	/**
 	 * Is this dialect known to support what ANSI-SQL terms "row value
 	 * constructor" syntax; sometimes called tuple syntax.
@@ -8527,7 +8518,7 @@ protected boolean supportsRowValueConstructorGtLtSyntax() {
 	 * constructor" syntax with distinct from comparison operators; false otherwise.
 	 */
 	protected boolean supportsRowValueConstructorDistinctFromSyntax() {
-		return supportsRowValueConstructorSyntax() && supportsDistinctFromPredicate();
+		return supportsRowValueConstructorSyntax() && dialect.supportsDistinctFromPredicate();
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1503,4 +1503,10 @@ public String getFromDualForSelectOnly() {`
`1503`	`1503`	`return getVersion().isSameOrAfter( 8 ) ? "" : ( " from " + getDual() );`
`1504`	`1504`	`}`
`1505`	`1505`
	`1506`	`+ @Override`
	`1507`	`+ public boolean supportsDistinctFromPredicate() {`
	`1508`	`+ // It supports a proprietary operator`
	`1509`	`+ return true;`
	`1510`	`+ }`
	`1511`	`+`
`1506`	`1512`	`}`
Original file line number	Diff line number	Diff line change
`@@ -493,11 +493,11 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp`
`493`	`493`	`// In SQL Server, XMLTYPE is not "comparable", so we have to cast the two parts to varchar for this purpose`
`494`	`494`	`switch ( operator ) {`
`495`	`495`	`case DISTINCT_FROM:`
`496`		`- if ( !supportsDistinctFromPredicate() ) {`
	`496`	`+ if ( !getDialect().supportsDistinctFromPredicate() ) {`
`497`	`497`	`appendSql( "not " );`
`498`	`498`	`}`
`499`	`499`	`case NOT_DISTINCT_FROM: {`
`500`		`- if ( !supportsDistinctFromPredicate() ) {`
	`500`	`+ if ( !getDialect().supportsDistinctFromPredicate() ) {`
`501`	`501`	`appendSql( "exists (select cast(" );`
`502`	`502`	`getClauseStack().push( Clause.SELECT );`
`503`	`503`	`visitSqlSelectExpression( lhs );`
`@@ -527,19 +527,14 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp`
`527`	`527`	`break;`
`528`	`528`	`}`
`529`	`529`	`}`
`530`		`- if ( supportsDistinctFromPredicate() ) {`
	`530`	`+ if ( getDialect().supportsDistinctFromPredicate() ) {`
`531`	`531`	`renderComparisonStandard( lhs, operator, rhs );`
`532`	`532`	`}`
`533`	`533`	`else {`
`534`	`534`	`renderComparisonEmulateIntersect( lhs, operator, rhs );`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`
`538`		`- @Override`
`539`		`- protected boolean supportsDistinctFromPredicate() {`
`540`		`- return getDialect().getVersion().isSameOrAfter( 16 );`
`541`		`- }`
`542`		`-`
`543`	`538`	`@Override`
`544`	`539`	`protected void renderSelectTupleComparison(`
`545`	`540`	`List<SqlSelection> lhsExpressions,`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp`
`423`	`423`	`break;`
`424`	`424`	`}`
`425`	`425`	`}`
`426`		`- if ( supportsDistinctFromPredicate() ) {`
	`426`	`+ if ( getDialect().supportsDistinctFromPredicate() ) {`
`427`	`427`	`renderComparisonEmulateIntersect( lhs, operator, rhs );`
`428`	`428`	`}`
`429`	`429`	`else {`
`@@ -482,7 +482,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp`
`482`	`482`	`}`
`483`	`483`	`}`
`484`	`484`	`else {`
`485`		`- if ( supportsDistinctFromPredicate() ) {`
	`485`	`+ if ( getDialect().supportsDistinctFromPredicate() ) {`
`486`	`486`	`renderComparisonEmulateIntersect( lhs, operator, rhs );`
`487`	`487`	`}`
`488`	`488`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -1596,4 +1596,11 @@ public boolean supportsBindingNullSqlTypeForSetNull() {`
`1596`	`1596`	`public String getDual() {`
`1597`	`1597`	`return "dual";`
`1598`	`1598`	`}`
	`1599`	`+`
	`1600`	`+ @Override`
	`1601`	`+ public boolean supportsDistinctFromPredicate() {`
	`1602`	`+ // It supports a proprietary operator`
	`1603`	`+ return true;`
	`1604`	`+ }`
	`1605`	`+`
`1599`	`1606`	`}`
Original file line number	Diff line number	Diff line change
`@@ -464,11 +464,11 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp`
`464`	`464`	`// In SQL Server, XMLTYPE is not "comparable", so we have to cast the two parts to varchar for this purpose`
`465`	`465`	`switch ( operator ) {`
`466`	`466`	`case DISTINCT_FROM:`
`467`		`- if ( !supportsDistinctFromPredicate() ) {`
	`467`	`+ if ( !getDialect().supportsDistinctFromPredicate() ) {`
`468`	`468`	`appendSql( "not " );`
`469`	`469`	`}`
`470`	`470`	`case NOT_DISTINCT_FROM: {`
`471`		`- if ( !supportsDistinctFromPredicate() ) {`
	`471`	`+ if ( !getDialect().supportsDistinctFromPredicate() ) {`
`472`	`472`	`appendSql( "exists (select cast(" );`
`473`	`473`	`getClauseStack().push( Clause.SELECT );`
`474`	`474`	`visitSqlSelectExpression( lhs );`
`@@ -498,19 +498,14 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp`
`498`	`498`	`break;`
`499`	`499`	`}`
`500`	`500`	`}`
`501`		`- if ( supportsDistinctFromPredicate() ) {`
	`501`	`+ if ( getDialect().supportsDistinctFromPredicate() ) {`
`502`	`502`	`renderComparisonStandard( lhs, operator, rhs );`
`503`	`503`	`}`
`504`	`504`	`else {`
`505`	`505`	`renderComparisonEmulateIntersect( lhs, operator, rhs );`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`
`509`		`- @Override`
`510`		`- protected boolean supportsDistinctFromPredicate() {`
`511`		`- return getDialect().getVersion().isSameOrAfter( 16 );`
`512`		`- }`
`513`		`-`
`514`	`509`	`@Override`
`515`	`510`	`protected void renderSelectTupleComparison(`
`516`	`511`	`List<SqlSelection> lhsExpressions,`