HHH-19260 - Move supportsRecursiveCycleClause() from AbstractSqlAstTranslator to Dialect

jrenaat · jrenaat · commit 46c99784acbe · 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
@@ -1670,4 +1670,9 @@ public boolean supportsNestedSubqueryCorrelation() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsRecursiveCycleClause() {
+		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
@@ -138,11 +138,6 @@ protected boolean supportsRecursiveSearchClause() {
 		return true;
 	}
 
-	@Override
-	protected boolean supportsRecursiveCycleClause() {
-		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
@@ -1631,4 +1631,9 @@ public boolean supportsArrayConstructor() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsRecursiveCycleClause() {
+		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
@@ -240,11 +240,6 @@ protected boolean supportsRecursiveSearchClause() {
 		return getDialect().getVersion().isSameOrAfter( 14 );
 	}
 
-	@Override
-	protected boolean supportsRecursiveCycleClause() {
-		return getDialect().getVersion().isSameOrAfter( 14 );
-	}
-
 	@Override
 	protected boolean supportsRecursiveCycleUsingClause() {
 		return getDialect().getVersion().isSameOrAfter( 14 );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -5930,4 +5930,11 @@ public boolean supportsNestedSubqueryCorrelation() {
 		return true;
 	}
 
+	/**
+	 * Whether the SQL cycle clause is supported, which can be used for recursive CTEs.
+	 */
+	public boolean supportsRecursiveCycleClause() {
+		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
@@ -1751,4 +1751,9 @@ public boolean supportsNestedSubqueryCorrelation() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsRecursiveCycleClause() {
+		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
@@ -148,11 +148,6 @@ protected boolean supportsRecursiveSearchClause() {
 		return true;
 	}
 
-	@Override
-	protected boolean supportsRecursiveCycleClause() {
-		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
@@ -1629,4 +1629,9 @@ public boolean supportsArrayConstructor() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsRecursiveCycleClause() {
+		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
@@ -242,11 +242,6 @@ protected boolean supportsRecursiveSearchClause() {
 		return getDialect().getVersion().isSameOrAfter( 14 );
 	}
 
-	@Override
-	protected boolean supportsRecursiveCycleClause() {
-		return getDialect().getVersion().isSameOrAfter( 14 );
-	}
-
 	@Override
 	protected boolean supportsRecursiveCycleUsingClause() {
 		return getDialect().getVersion().isSameOrAfter( 14 );
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
@@ -2330,13 +2330,13 @@ protected void renderCteColumns(CteStatement cte) {
 					appendSql( cte.getSearchColumn().getColumnExpression() );
 				}
 			}
-			if ( !supportsRecursiveCycleClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() ) {
 				if ( cte.getCycleMarkColumn() != null ) {
 					appendSql( COMMA_SEPARATOR );
 					appendSql( cte.getCycleMarkColumn().getColumnExpression() );
 				}
 			}
-			if ( cte.getCycleMarkColumn() != null && !supportsRecursiveCycleClause()
+			if ( cte.getCycleMarkColumn() != null && !dialect.supportsRecursiveCycleClause()
 					|| cte.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {
 				appendSql( COMMA_SEPARATOR );
 				appendSql( determineCyclePathColumnName( cte ) );
@@ -2474,13 +2474,6 @@ protected boolean supportsRecursiveSearchClause() {
 		return false;
 	}
 
-	/**
-	 * Whether the SQL cycle clause is supported, which can be used for recursive CTEs.
-	 */
-	protected boolean supportsRecursiveCycleClause() {
-		return false;
-	}
-
 	/**
 	 * Whether the SQL cycle clause supports the using sub-clause.
 	 */
@@ -2553,7 +2546,7 @@ else if ( renderNullPrecedence ) {
 	}
 
 	protected void renderCycleClause(CteStatement cte) {
-		if ( supportsRecursiveCycleClause() ) {
+		if ( dialect.supportsRecursiveCycleClause() ) {
 			renderStandardCycleClause( cte );
 		}
 	}
@@ -2592,7 +2585,7 @@ protected void renderRecursiveCteVirtualSelections(SelectClause selectClause) {
 					emulateSearchClauseOrderWithString( selectClause );
 				}
 			}
-			if ( !supportsRecursiveCycleClause() || currentCteStatement.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() || currentCteStatement.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {
 				if ( currentCteStatement.getCycleMarkColumn() != null ) {
 					appendSql( COMMA_SEPARATOR );
 					if ( supportsRecursiveClauseArrayAndRowEmulation() ) {
@@ -2601,7 +2594,7 @@ protected void renderRecursiveCteVirtualSelections(SelectClause selectClause) {
 					else {
 						emulateCycleClauseWithString( selectClause );
 					}
-					if ( !supportsRecursiveCycleClause() && isInRecursiveQueryPart() ) {
+					if ( !dialect.supportsRecursiveCycleClause() && isInRecursiveQueryPart() ) {
 						final ColumnReference cycleColumnReference = new ColumnReference(
 								findTableReferenceByTableId( currentCteStatement.getCteTable().getTableExpression() ),
 								currentCteStatement.getCycleMarkColumn().getColumnExpression(),
@@ -2981,7 +2974,7 @@ protected void emulateCycleClauseWithRowAndArray(SelectClause selectClause) {
 					stringType
 			);
 
-			if ( !supportsRecursiveCycleClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() ) {
 				// Cycle mark
 				appendSql( "case when " );
 				final String arrayContainsFunction = getArrayContainsFunction();
@@ -3048,7 +3041,7 @@ protected void emulateCycleClauseWithRowAndArray(SelectClause selectClause) {
 			appendSql( ']' );
 		}
 		else {
-			if ( !supportsRecursiveCycleClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() ) {
 				// Cycle mark
 				currentCteStatement.getNoCycleValue().accept( this );
 				appendSql( COMMA_SEPARATOR );
@@ -3149,7 +3142,7 @@ private void emulateCycleClauseWithString(SelectClause selectClause) {
 			}
 			arguments.add( nullSeparator );
 
-			if ( !supportsRecursiveCycleClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() ) {
 				// Cycle mark
 				appendSql( "case when " );
 				renderStringContainsExactlyPredicate(
@@ -3176,7 +3169,7 @@ private void emulateCycleClauseWithString(SelectClause selectClause) {
 			concat.render( this, arguments, stringType, this );
 		}
 		else {
-			if ( !supportsRecursiveCycleClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() ) {
 				// Cycle mark
 				currentCteStatement.getNoCycleValue().accept( this );
 				appendSql( COMMA_SEPARATOR );

Original file line number	Diff line number	Diff line change
`@@ -1670,4 +1670,9 @@ public boolean supportsNestedSubqueryCorrelation() {`
`1670`	`1670`	`return false;`
`1671`	`1671`	`}`
`1672`	`1672`
	`1673`	`+ @Override`
	`1674`	`+ public boolean supportsRecursiveCycleClause() {`
	`1675`	`+ return true;`
	`1676`	`+ }`
	`1677`	`+`
`1673`	`1678`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1631,4 +1631,9 @@ public boolean supportsArrayConstructor() {`
`1631`	`1631`	`return true;`
`1632`	`1632`	`}`
`1633`	`1633`
	`1634`	`+ @Override`
	`1635`	`+ public boolean supportsRecursiveCycleClause() {`
	`1636`	`+ return getVersion().isSameOrAfter( 14 );`
	`1637`	`+ }`
	`1638`	`+`
`1634`	`1639`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5930,4 +5930,11 @@ public boolean supportsNestedSubqueryCorrelation() {`
`5930`	`5930`	`return true;`
`5931`	`5931`	`}`
`5932`	`5932`
	`5933`	`+ /**`
	`5934`	`+ * Whether the SQL cycle clause is supported, which can be used for recursive CTEs.`
	`5935`	`+ */`
	`5936`	`+ public boolean supportsRecursiveCycleClause() {`
	`5937`	`+ return false;`
	`5938`	`+ }`
	`5939`	`+`
`5933`	`5940`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1751,4 +1751,9 @@ public boolean supportsNestedSubqueryCorrelation() {`
`1751`	`1751`	`return false;`
`1752`	`1752`	`}`
`1753`	`1753`
	`1754`	`+ @Override`
	`1755`	`+ public boolean supportsRecursiveCycleClause() {`
	`1756`	`+ return true;`
	`1757`	`+ }`
	`1758`	`+`
`1754`	`1759`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1629,4 +1629,9 @@ public boolean supportsArrayConstructor() {`
`1629`	`1629`	`return true;`
`1630`	`1630`	`}`
`1631`	`1631`
	`1632`	`+ @Override`
	`1633`	`+ public boolean supportsRecursiveCycleClause() {`
	`1634`	`+ return getVersion().isSameOrAfter( 14 );`
	`1635`	`+ }`
	`1636`	`+`
`1632`	`1637`	`}`