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

jrenaat · jrenaat · commit c2f06eb1b09f · 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/PostgreSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
@@ -1636,4 +1636,9 @@ public boolean supportsRecursiveCycleClause() {
 		return getVersion().isSameOrAfter( 14 );
 	}
 
+	@Override
+	public boolean supportsRecursiveCycleUsingClause() {
+		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,15 +240,10 @@ protected boolean supportsRecursiveSearchClause() {
 		return getDialect().getVersion().isSameOrAfter( 14 );
 	}
 
-	@Override
-	protected boolean supportsRecursiveCycleUsingClause() {
-		return getDialect().getVersion().isSameOrAfter( 14 );
-	}
-
 	@Override
 	protected void renderStandardCycleClause(CteStatement cte) {
 		super.renderStandardCycleClause( cte );
-		if ( cte.getCycleMarkColumn() != null && cte.getCyclePathColumn() == null && supportsRecursiveCycleUsingClause() ) {
+		if ( cte.getCycleMarkColumn() != null && cte.getCyclePathColumn() == null && getDialect().supportsRecursiveCycleUsingClause() ) {
 			appendSql( " using " );
 			appendSql( determineCyclePathColumnName( 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
@@ -5937,4 +5937,11 @@ public boolean supportsRecursiveCycleClause() {
 		return false;
 	}
 
+	/**
+	 * Whether the SQL cycle clause supports the using sub-clause.
+	 */
+	public boolean supportsRecursiveCycleUsingClause() {
+		return false;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -1634,4 +1634,9 @@ public boolean supportsRecursiveCycleClause() {
 		return getVersion().isSameOrAfter( 14 );
 	}
 
+	@Override
+	public boolean supportsRecursiveCycleUsingClause() {
+		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,15 +242,10 @@ protected boolean supportsRecursiveSearchClause() {
 		return getDialect().getVersion().isSameOrAfter( 14 );
 	}
 
-	@Override
-	protected boolean supportsRecursiveCycleUsingClause() {
-		return getDialect().getVersion().isSameOrAfter( 14 );
-	}
-
 	@Override
 	protected void renderStandardCycleClause(CteStatement cte) {
 		super.renderStandardCycleClause( cte );
-		if ( cte.getCycleMarkColumn() != null && cte.getCyclePathColumn() == null && supportsRecursiveCycleUsingClause() ) {
+		if ( cte.getCycleMarkColumn() != null && cte.getCyclePathColumn() == null && getDialect().supportsRecursiveCycleUsingClause() ) {
 			appendSql( " using " );
 			appendSql( determineCyclePathColumnName( 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
@@ -2337,7 +2337,7 @@ protected void renderCteColumns(CteStatement cte) {
 				}
 			}
 			if ( cte.getCycleMarkColumn() != null && !dialect.supportsRecursiveCycleClause()
-					|| cte.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {
+					|| cte.getCyclePathColumn() != null && !dialect.supportsRecursiveCycleUsingClause() ) {
 				appendSql( COMMA_SEPARATOR );
 				appendSql( determineCyclePathColumnName( cte ) );
 			}
@@ -2474,13 +2474,6 @@ protected boolean supportsRecursiveSearchClause() {
 		return false;
 	}
 
-	/**
-	 * Whether the SQL cycle clause supports the using sub-clause.
-	 */
-	protected boolean supportsRecursiveCycleUsingClause() {
-		return false;
-	}
-
 	/**
 	 * Whether the recursive search and cycle clause emulations based on the array and row constructor is supported.
 	 */
@@ -2567,7 +2560,7 @@ protected void renderStandardCycleClause(CteStatement cte) {
 			cte.getCycleValue().accept( this );
 			appendSql( " default " );
 			cte.getNoCycleValue().accept( this );
-			if ( cte.getCyclePathColumn() != null && supportsRecursiveCycleUsingClause() ) {
+			if ( cte.getCyclePathColumn() != null && dialect.supportsRecursiveCycleUsingClause() ) {
 				appendSql( " using " );
 				appendSql( cte.getCyclePathColumn().getColumnExpression() );
 			}
@@ -2585,7 +2578,7 @@ protected void renderRecursiveCteVirtualSelections(SelectClause selectClause) {
 					emulateSearchClauseOrderWithString( selectClause );
 				}
 			}
-			if ( !dialect.supportsRecursiveCycleClause() || currentCteStatement.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {
+			if ( !dialect.supportsRecursiveCycleClause() || currentCteStatement.getCyclePathColumn() != null && !dialect.supportsRecursiveCycleUsingClause() ) {
 				if ( currentCteStatement.getCycleMarkColumn() != null ) {
 					appendSql( COMMA_SEPARATOR );
 					if ( supportsRecursiveClauseArrayAndRowEmulation() ) {

Original file line number	Diff line number	Diff line change
`@@ -1636,4 +1636,9 @@ public boolean supportsRecursiveCycleClause() {`
`1636`	`1636`	`return getVersion().isSameOrAfter( 14 );`
`1637`	`1637`	`}`
`1638`	`1638`
	`1639`	`+ @Override`
	`1640`	`+ public boolean supportsRecursiveCycleUsingClause() {`
	`1641`	`+ return getVersion().isSameOrAfter( 14 );`
	`1642`	`+ }`
	`1643`	`+`
`1639`	`1644`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5937,4 +5937,11 @@ public boolean supportsRecursiveCycleClause() {`
`5937`	`5937`	`return false;`
`5938`	`5938`	`}`
`5939`	`5939`
	`5940`	`+ /**`
	`5941`	`+ * Whether the SQL cycle clause supports the using sub-clause.`
	`5942`	`+ */`
	`5943`	`+ public boolean supportsRecursiveCycleUsingClause() {`
	`5944`	`+ return false;`
	`5945`	`+ }`
	`5946`	`+`
`5940`	`5947`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1634,4 +1634,9 @@ public boolean supportsRecursiveCycleClause() {`
`1634`	`1634`	`return getVersion().isSameOrAfter( 14 );`
`1635`	`1635`	`}`
`1636`	`1636`
	`1637`	`+ @Override`
	`1638`	`+ public boolean supportsRecursiveCycleUsingClause() {`
	`1639`	`+ return getVersion().isSameOrAfter( 14 );`
	`1640`	`+ }`
	`1641`	`+`
`1637`	`1642`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2337,7 +2337,7 @@ protected void renderCteColumns(CteStatement cte) {`
`2337`	`2337`	`}`
`2338`	`2338`	`}`
`2339`	`2339`	`if ( cte.getCycleMarkColumn() != null && !dialect.supportsRecursiveCycleClause()`
`2340`		`- \|\| cte.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {`
	`2340`	`+ \|\| cte.getCyclePathColumn() != null && !dialect.supportsRecursiveCycleUsingClause() ) {`
`2341`	`2341`	`appendSql( COMMA_SEPARATOR );`
`2342`	`2342`	`appendSql( determineCyclePathColumnName( cte ) );`
`2343`	`2343`	`}`
`@@ -2474,13 +2474,6 @@ protected boolean supportsRecursiveSearchClause() {`
`2474`	`2474`	`return false;`
`2475`	`2475`	`}`
`2476`	`2476`
`2477`		`- /**`
`2478`		`- * Whether the SQL cycle clause supports the using sub-clause.`
`2479`		`- */`
`2480`		`- protected boolean supportsRecursiveCycleUsingClause() {`
`2481`		`- return false;`
`2482`		`- }`
`2483`		`-`
`2484`	`2477`	`/**`
`2485`	`2478`	`* Whether the recursive search and cycle clause emulations based on the array and row constructor is supported.`
`2486`	`2479`	`*/`
`@@ -2567,7 +2560,7 @@ protected void renderStandardCycleClause(CteStatement cte) {`
`2567`	`2560`	`cte.getCycleValue().accept( this );`
`2568`	`2561`	`appendSql( " default " );`
`2569`	`2562`	`cte.getNoCycleValue().accept( this );`
`2570`		`- if ( cte.getCyclePathColumn() != null && supportsRecursiveCycleUsingClause() ) {`
	`2563`	`+ if ( cte.getCyclePathColumn() != null && dialect.supportsRecursiveCycleUsingClause() ) {`
`2571`	`2564`	`appendSql( " using " );`
`2572`	`2565`	`appendSql( cte.getCyclePathColumn().getColumnExpression() );`
`2573`	`2566`	`}`
`@@ -2585,7 +2578,7 @@ protected void renderRecursiveCteVirtualSelections(SelectClause selectClause) {`
`2585`	`2578`	`emulateSearchClauseOrderWithString( selectClause );`
`2586`	`2579`	`}`
`2587`	`2580`	`}`
`2588`		`- if ( !dialect.supportsRecursiveCycleClause() \|\| currentCteStatement.getCyclePathColumn() != null && !supportsRecursiveCycleUsingClause() ) {`
	`2581`	`+ if ( !dialect.supportsRecursiveCycleClause() \|\| currentCteStatement.getCyclePathColumn() != null && !dialect.supportsRecursiveCycleUsingClause() ) {`
`2589`	`2582`	`if ( currentCteStatement.getCycleMarkColumn() != null ) {`
`2590`	`2583`	`appendSql( COMMA_SEPARATOR );`
`2591`	`2584`	`if ( supportsRecursiveClauseArrayAndRowEmulation() ) {`