HHH-19260 - Move supportsRecursiveSearchClause() to Dialect

jrenaat · jrenaat · commit faa152ad995d · 2025-03-20T14:14:56.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/OracleLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
@@ -1675,4 +1675,9 @@ public boolean supportsRecursiveCycleClause() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsRecursiveSearchClause() {
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java
@@ -133,11 +133,6 @@ protected boolean supportsWithClauseInSubquery() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsRecursiveSearchClause() {
-		return true;
-	}
-
 	@Override
 	public void visitSqlSelection(SqlSelection sqlSelection) {
 		if ( getCurrentCteStatement() != null ) {
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
@@ -1641,4 +1641,9 @@ public boolean supportsRecursiveCycleUsingClause() {
 		return getVersion().isSameOrAfter( 14 );
 	}
 
+	@Override
+	public boolean supportsRecursiveSearchClause() {
+		return getVersion().isSameOrAfter( 14 );
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java
@@ -235,11 +235,6 @@ public void visitOffsetFetchClause(QueryPart queryPart) {
 		}
 	}
 
-	@Override
-	protected boolean supportsRecursiveSearchClause() {
-		return getDialect().getVersion().isSameOrAfter( 14 );
-	}
-
 	@Override
 	protected void renderStandardCycleClause(CteStatement cte) {
 		super.renderStandardCycleClause( cte );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -5944,4 +5944,11 @@ public boolean supportsRecursiveCycleUsingClause() {
 		return false;
 	}
 
+	/**
+	 * Whether the SQL search clause is supported, which can be used for recursive CTEs.
+	 */
+	public boolean supportsRecursiveSearchClause() {
+		return false;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -1756,4 +1756,9 @@ public boolean supportsRecursiveCycleClause() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsRecursiveSearchClause() {
+		return true;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java
@@ -143,11 +143,6 @@ protected boolean supportsWithClauseInSubquery() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsRecursiveSearchClause() {
-		return true;
-	}
-
 	@Override
 	public void visitSqlSelection(SqlSelection sqlSelection) {
 		if ( getCurrentCteStatement() != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -1639,4 +1639,9 @@ public boolean supportsRecursiveCycleUsingClause() {
 		return getVersion().isSameOrAfter( 14 );
 	}
 
+	@Override
+	public boolean supportsRecursiveSearchClause() {
+		return getVersion().isSameOrAfter( 14 );
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
@@ -237,11 +237,6 @@ public void visitOffsetFetchClause(QueryPart queryPart) {
 		}
 	}
 
-	@Override
-	protected boolean supportsRecursiveSearchClause() {
-		return getDialect().getVersion().isSameOrAfter( 14 );
-	}
-
 	@Override
 	protected void renderStandardCycleClause(CteStatement cte) {
 		super.renderStandardCycleClause( cte );
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
@@ -2320,7 +2320,7 @@ protected void renderCteColumns(CteStatement cte) {
 			}
 		}
 		if ( cte.isRecursive() ) {
-			if ( !supportsRecursiveSearchClause() ) {
+			if ( !dialect.supportsRecursiveSearchClause() ) {
 				if ( cte.getSearchColumn() != null ) {
 					appendSql( COMMA_SEPARATOR );
 					if ( cte.getSearchClauseKind() == CteSearchClauseKind.BREADTH_FIRST ) {
@@ -2467,13 +2467,6 @@ protected boolean needsRecursiveKeywordInWithClause() {
 		return true;
 	}
 
-	/**
-	 * Whether the SQL search clause is supported, which can be used for recursive CTEs.
-	 */
-	protected boolean supportsRecursiveSearchClause() {
-		return false;
-	}
-
 	/**
 	 * Whether the recursive search and cycle clause emulations based on the array and row constructor is supported.
 	 */
@@ -2488,7 +2481,7 @@ protected void renderMaterializationHint(CteMaterialization materialization) {
 	}
 
 	protected void renderSearchClause(CteStatement cte) {
-		if ( supportsRecursiveSearchClause() ) {
+		if ( dialect.supportsRecursiveSearchClause() ) {
 			renderStandardSearchClause( cte );
 		}
 	}
@@ -2569,7 +2562,7 @@ protected void renderStandardCycleClause(CteStatement cte) {
 
 	protected void renderRecursiveCteVirtualSelections(SelectClause selectClause) {
 		if ( currentCteStatement != null && currentCteStatement.isRecursive() ) {
-			if ( currentCteStatement.getSearchColumn() != null && !supportsRecursiveSearchClause() ) {
+			if ( currentCteStatement.getSearchColumn() != null && !dialect.supportsRecursiveSearchClause() ) {
 				appendSql( COMMA_SEPARATOR );
 				if ( supportsRecursiveClauseArrayAndRowEmulation() ) {
 					emulateSearchClauseOrderWithRowAndArray( selectClause );

Original file line number	Diff line number	Diff line change
`@@ -1675,4 +1675,9 @@ public boolean supportsRecursiveCycleClause() {`
`1675`	`1675`	`return true;`
`1676`	`1676`	`}`
`1677`	`1677`
	`1678`	`+ @Override`
	`1679`	`+ public boolean supportsRecursiveSearchClause() {`
	`1680`	`+ return true;`
	`1681`	`+ }`
	`1682`	`+`
`1678`	`1683`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1641,4 +1641,9 @@ public boolean supportsRecursiveCycleUsingClause() {`
`1641`	`1641`	`return getVersion().isSameOrAfter( 14 );`
`1642`	`1642`	`}`
`1643`	`1643`
	`1644`	`+ @Override`
	`1645`	`+ public boolean supportsRecursiveSearchClause() {`
	`1646`	`+ return getVersion().isSameOrAfter( 14 );`
	`1647`	`+ }`
	`1648`	`+`
`1644`	`1649`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,6 @@ public void visitOffsetFetchClause(QueryPart queryPart) {`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
`238`		`- @Override`
`239`		`- protected boolean supportsRecursiveSearchClause() {`
`240`		`- return getDialect().getVersion().isSameOrAfter( 14 );`
`241`		`- }`
`242`		`-`
`243`	`238`	`@Override`
`244`	`239`	`protected void renderStandardCycleClause(CteStatement cte) {`
`245`	`240`	`super.renderStandardCycleClause( cte );`
Original file line number	Diff line number	Diff line change
`@@ -5944,4 +5944,11 @@ public boolean supportsRecursiveCycleUsingClause() {`
`5944`	`5944`	`return false;`
`5945`	`5945`	`}`
`5946`	`5946`
	`5947`	`+ /**`
	`5948`	`+ * Whether the SQL search clause is supported, which can be used for recursive CTEs.`
	`5949`	`+ */`
	`5950`	`+ public boolean supportsRecursiveSearchClause() {`
	`5951`	`+ return false;`
	`5952`	`+ }`
	`5953`	`+`
`5947`	`5954`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1756,4 +1756,9 @@ public boolean supportsRecursiveCycleClause() {`
`1756`	`1756`	`return true;`
`1757`	`1757`	`}`
`1758`	`1758`
	`1759`	`+ @Override`
	`1760`	`+ public boolean supportsRecursiveSearchClause() {`
	`1761`	`+ return true;`
	`1762`	`+ }`
	`1763`	`+`
`1759`	`1764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1639,4 +1639,9 @@ public boolean supportsRecursiveCycleUsingClause() {`
`1639`	`1639`	`return getVersion().isSameOrAfter( 14 );`
`1640`	`1640`	`}`
`1641`	`1641`
	`1642`	`+ @Override`
	`1643`	`+ public boolean supportsRecursiveSearchClause() {`
	`1644`	`+ return getVersion().isSameOrAfter( 14 );`
	`1645`	`+ }`
	`1646`	`+`
`1642`	`1647`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,11 +237,6 @@ public void visitOffsetFetchClause(QueryPart queryPart) {`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
`240`		`- @Override`
`241`		`- protected boolean supportsRecursiveSearchClause() {`
`242`		`- return getDialect().getVersion().isSameOrAfter( 14 );`
`243`		`- }`
`244`		`-`
`245`	`240`	`@Override`
`246`	`241`	`protected void renderStandardCycleClause(CteStatement cte) {`
`247`	`242`	`super.renderStandardCycleClause( cte );`