Fix a type and missing branches in base walkers for ordered set aggregates

Author: beikov

hibernate-core/src/main/java/org/hibernate/query/sqm/spi/BaseSemanticQueryWalker.java

@@ -53,6 +53,7 @@
 import org.hibernate.query.sqm.tree.expression.SqmLiteralEntityType;
 import org.hibernate.query.sqm.tree.expression.SqmModifiedSubQueryExpression;
 import org.hibernate.query.sqm.tree.expression.SqmNamedParameter;
+import org.hibernate.query.sqm.tree.expression.SqmOrderedSetAggregateFunction;
 import org.hibernate.query.sqm.tree.expression.SqmOverflow;
 import org.hibernate.query.sqm.tree.expression.SqmParameterizedEntityType;
 import org.hibernate.query.sqm.tree.expression.SqmPositionalParameter;
@@ -582,6 +583,9 @@ public Object visitFunction(SqmFunction<?> sqmFunction) {
 			if ( filter != null ) {
 				filter.accept( this );
 			}
+			if ( sqmFunction instanceof SqmOrderedSetAggregateFunction<?> ) {
+				visitOrderByClause( ( (SqmOrderedSetAggregateFunction<?>) sqmFunction ).getWithinGroup() );
+			}
 		}
 		return sqmFunction;
 	}

hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java

@@ -161,7 +161,7 @@ public interface SqlAstWalker {
 
 	void visitQueryLiteral(QueryLiteral<?> queryLiteral);
 
-	void acceptConvertedQueryLiteral(ConvertedQueryLiteral<?,?> convertedQueryLiteral);
+	void visitConvertedQueryLiteral(ConvertedQueryLiteral<?,?> convertedQueryLiteral);
 
 	void visitUnaryOperationExpression(UnaryOperation unaryOperationExpression);
 

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java

@@ -4589,7 +4589,7 @@ public void visitQueryLiteral(QueryLiteral<?> queryLiteral) {
 	}
 
 	@Override
-	public void acceptConvertedQueryLiteral(ConvertedQueryLiteral<?, ?> convertedQueryLiteral) {
+	public void visitConvertedQueryLiteral(ConvertedQueryLiteral<?, ?> convertedQueryLiteral) {
 		visitLiteral( convertedQueryLiteral );
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java

@@ -34,6 +34,7 @@
 import org.hibernate.sql.ast.tree.expression.JdbcLiteral;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.expression.ModifiedSubQueryExpression;
+import org.hibernate.sql.ast.tree.expression.OrderedSetAggregateFunctionExpression;
 import org.hibernate.sql.ast.tree.expression.Over;
 import org.hibernate.sql.ast.tree.expression.Overflow;
 import org.hibernate.sql.ast.tree.expression.QueryLiteral;
@@ -106,6 +107,11 @@ public void visitSelfRenderingExpression(SelfRenderingExpression expression) {
 				if ( aggregateFunctionExpression.getFilter() != null ) {
 					aggregateFunctionExpression.getFilter().accept( this );
 				}
+				if ( expression instanceof OrderedSetAggregateFunctionExpression ) {
+					for ( SortSpecification specification : ( (OrderedSetAggregateFunctionExpression) expression ).getWithinGroup() ) {
+						specification.accept( this );
+					}
+				}
 			}
 		}
 	}
@@ -480,7 +486,7 @@ public void visitQueryLiteral(QueryLiteral<?> queryLiteral) {
 	}
 
 	@Override
-	public void acceptConvertedQueryLiteral(ConvertedQueryLiteral<?,?> convertedQueryLiteral) {
+	public void visitConvertedQueryLiteral(ConvertedQueryLiteral<?,?> convertedQueryLiteral) {
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java

@@ -219,7 +219,7 @@ public void visitQueryLiteral(QueryLiteral<?> queryLiteral) {
 	}
 
 	@Override
-	public void acceptConvertedQueryLiteral(ConvertedQueryLiteral<?, ?> convertedQueryLiteral) {
+	public void visitConvertedQueryLiteral(ConvertedQueryLiteral<?, ?> convertedQueryLiteral) {
 		doReplaceExpression( convertedQueryLiteral );
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ConvertedQueryLiteral.java

@@ -97,7 +97,7 @@ public void bindParameterValue(
 
 	@Override
 	public void accept(SqlAstWalker sqlTreeWalker) {
-		sqlTreeWalker.acceptConvertedQueryLiteral( this );
+		sqlTreeWalker.visitConvertedQueryLiteral( this );
 	}
 
 	@Override