Polishing.

Inline select_query into select_statement, simplify set_function resolution.
Align JPQL and EQL grammars.
Adopt Hibernate version guards in tests.

Original Pull Request: #3695

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlSortedQueryTransformer.java

@@ -55,16 +55,6 @@ class JpqlSortedQueryTransformer extends JpqlQueryRenderer {
 	@Override
 	public QueryTokenStream visitSelect_statement(JpqlParser.Select_statementContext ctx) {
 
-		if(ctx.select_query() != null) {
-			return visitSelect_query(ctx.select_query());
-		}
-
-		return QueryTokenStream.empty();
-	}
-
-	@Override
-	public QueryTokenStream visitSelect_query(JpqlParser.Select_queryContext ctx) {
-
 		QueryRendererBuilder builder = QueryRenderer.builder();
 
 		builder.appendExpression(visit(ctx.select_clause()));
@@ -111,7 +101,7 @@ public QueryTokenStream visitSelect_clause(JpqlParser.Select_clauseContext ctx)
 		return builder.append(dtoDelegate.transformSelectionList(tokenStream));
 	}
 
-	private void doVisitOrderBy(QueryRendererBuilder builder, JpqlParser.Select_queryContext ctx) {
+	private void doVisitOrderBy(QueryRendererBuilder builder, JpqlParser.Select_statementContext ctx) {
 
 		if (ctx.orderby_clause() != null) {
 			QueryTokenStream existingOrder = visit(ctx.orderby_clause());