HHH-19260 - Move supportsSimpleQueryGrouping() to Dialect

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

Author: jrenaat

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

@@ -723,4 +723,9 @@ public boolean supportsJoinsInDelete() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsSimpleQueryGrouping() {
+		return false;
+	}
+
 }

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

@@ -233,9 +233,4 @@ protected boolean supportsWithClauseInSubquery() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsSimpleQueryGrouping() {
-		return false;
-	}
-
 }

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

@@ -1118,4 +1118,11 @@ public boolean supportsIntersect() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsSimpleQueryGrouping() {
+		// Firebird 4 and earlier are quite strict i.e. it requires `select ... union all select * from (select ...)`
+		// rather than `select ... union all (select ...)`
+		return getVersion().isSameOrAfter( 5 );
+	}
+
 }

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

@@ -187,13 +187,6 @@ public void visitOffsetFetchClause(QueryPart queryPart) {
 		}
 	}
 
-	@Override
-	protected boolean supportsSimpleQueryGrouping() {
-		// Firebird 4 and earlier are quite strict i.e. it requires `select .. union all select * from (select ...)`
-		// rather than `select .. union all (select ...)`
-		return getDialect().getVersion().isSameOrAfter( 5 );
-	}
-
 	@Override
 	protected void renderSelectExpression(Expression expression) {
 		renderSelectExpressionWithCastedOrInlinedPlainParameters( expression );

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

@@ -308,4 +308,9 @@ public boolean supportsIntersect() {
 		return getVersion().isSameOrAfter( 10, 3 );
 	}
 
+	@Override
+	public boolean supportsSimpleQueryGrouping() {
+		return getVersion().isSameOrAfter( 10, 4 );
+	}
+
 }

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

@@ -230,17 +230,12 @@ protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
 		return useOffsetFetchClause( queryPart ) && getQueryPartForRowNumbering() != queryPart && supportsWindowFunctions() && !isRowsOnlyFetchClauseType( queryPart );
 	}
 
-	@Override
-	protected boolean supportsSimpleQueryGrouping() {
-		return dialect.getVersion().isSameOrAfter( 10, 4 );
-	}
-
 	@Override
 	protected boolean shouldEmulateLateralWithIntersect(QueryPart queryPart) {
 		// Intersect emulation requires nested correlation when no simple query grouping is possible
 		// and the query has an offset/fetch clause, so we have to disable the emulation in this case,
 		// because nested correlation is not supported though
-		return supportsSimpleQueryGrouping() || !queryPart.hasOffsetOrFetchClause();
+		return getDialect().supportsSimpleQueryGrouping() || !queryPart.hasOffsetOrFetchClause();
 	}
 
 	@Override

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

@@ -1524,4 +1524,9 @@ public boolean supportsNestedSubqueryCorrelation() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsSimpleQueryGrouping() {
+		return getVersion().isSameOrAfter( 8 );
+	}
+
 }

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

@@ -379,11 +379,6 @@ protected boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsSimpleQueryGrouping() {
-		return getDialect().getVersion().isSameOrAfter( 8 );
-	}
-
 	@Override
 	protected boolean supportsWithClause() {
 		return getDialect().getVersion().isSameOrAfter( 8 );

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

@@ -1262,4 +1262,12 @@ public boolean supportsJoinsInDelete() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsSimpleQueryGrouping() {
+		// SQL Server is quite strict i.e. it requires `select ... union all select * from (select ...)`
+		// rather than `select ... union all (select ...)` because parenthesis followed by select
+		// is always treated as a subquery, which is not supported in a set operation
+		return false;
+	}
+
 }

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

@@ -351,14 +351,6 @@ else if ( !queryPart.hasSortSpecifications() && ((QuerySpec) queryPart).getSelec
 		}
 	}
 
-	@Override
-	protected boolean supportsSimpleQueryGrouping() {
-		// SQL Server is quite strict i.e. it requires `select .. union all select * from (select ...)`
-		// rather than `select .. union all (select ...)` because parenthesis followed by select
-		// is always treated as a subquery, which is not supported in a set operation
-		return false;
-	}
-
 	protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
 		// Check if current query part is already row numbering to avoid infinite recursion
 		return getQueryPartForRowNumbering() != queryPart && getOffsetFetchClauseMode( queryPart ) == OffsetFetchClauseMode.EMULATED;