GH-3864: Add support for Set-Returning Functions (SRF) in HQL parser and query rendering for H7

Signed-off-by: oscarfanchin <[email protected]>

Author: oscarfanchin

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4

@@ -114,15 +114,25 @@ joinSpecifier
 fromRoot
     : entityName variable?
     | LATERAL? '(' subquery ')' variable?
+    | functionCallAsFromSource variable?
     ;
 
+functionCallAsFromSource
+    : identifier '(' (expression (',' expression)*)? ')'
+    ;    
+
 join
     : joinType JOIN FETCH? joinTarget joinRestriction? // Spec BNF says joinType isn't optional, but text says that it is.
     ;
 
 joinTarget
     : path variable?                        # JoinPath
     | LATERAL? '(' subquery ')' variable?   # JoinSubquery
+    | functionCallAsJoinTarget variable?    # JoinFunctionCall
+    ;
+
+functionCallAsJoinTarget
+    : identifier '(' (expression (',' expression)*)? ')'
     ;
 
 // https://docs.jboss.org/hibernate/orm/6.1/userguide/html_single/Hibernate_User_Guide.html#hql-update
@@ -1878,4 +1888,4 @@ ESCAPE_SEQUENCE
 
 QUOTED_IDENTIFIER
     : BACKTICK ( ESCAPE_SEQUENCE | '\\' BACKTICK | ~([`]) )* BACKTICK
-    ;
+    ;

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

@@ -23,19 +23,29 @@
  * Hibernate-specific query details capturing common table expression details.
  *
  * @author Mark Paluch
+ * @author oscar.fanchin
  * @since 3.5
  */
 class HibernateQueryInformation extends QueryInformation {
 
 	private final boolean hasCte;
+	
+	private final boolean hasFromFunction;
+	
 
 	public HibernateQueryInformation(@Nullable String alias, List<QueryToken> projection,
-			boolean hasConstructorExpression, boolean hasCte) {
+			boolean hasConstructorExpression, boolean hasCte,boolean hasFromFunction) {
 		super(alias, projection, hasConstructorExpression);
 		this.hasCte = hasCte;
+		this.hasFromFunction = hasFromFunction;
 	}
 
 	public boolean hasCte() {
 		return hasCte;
 	}
+	
+	public boolean hasFromFunction() {
+		return hasFromFunction;
+	}
+	
 }

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

@@ -29,6 +29,7 @@
  * @author Greg Turnquist
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author oscar.fanchin
  * @since 3.1
  */
 @SuppressWarnings("ConstantValue")
@@ -37,11 +38,13 @@ class HqlCountQueryTransformer extends HqlQueryRenderer {
 	private final @Nullable String countProjection;
 	private final @Nullable String primaryFromAlias;
 	private final boolean containsCTE;
+	private final boolean containsFromFunction;
 
 	HqlCountQueryTransformer(@Nullable String countProjection, HibernateQueryInformation queryInformation) {
 		this.countProjection = countProjection;
 		this.primaryFromAlias = queryInformation.getAlias();
 		this.containsCTE = queryInformation.hasCte();
+		this.containsFromFunction = queryInformation.hasFromFunction();
 	}
 
 	@Override
@@ -147,11 +150,19 @@ public QueryRendererBuilder visitFromRoot(HqlParser.FromRootContext ctx) {
 
 			builder.appendExpression(nested);
 
+			if (ctx.variable() != null) {
+				builder.appendExpression(visit(ctx.variable()));
+			}
+		} else if (ctx.functionCallAsFromSource() != null) {
+
+			builder.appendExpression(visit(ctx.functionCallAsFromSource()));
+
 			if (ctx.variable() != null) {
 				builder.appendExpression(visit(ctx.variable()));
 			}
 		}
 
+
 		return builder;
 	}
 
@@ -194,7 +205,7 @@ public QueryTokenStream visitSelectClause(HqlParser.SelectClauseContext ctx) {
 			} else {
 
 				// with CTE primary alias fails with hibernate (WITH entities AS (…) SELECT count(c) FROM entities c)
-				if (containsCTE) {
+				if (containsCTE || containsFromFunction) {
 					nested.append(QueryTokens.token("*"));
 				} else {
 

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

@@ -28,6 +28,7 @@
  * {@link ParsedQueryIntrospector} for HQL queries.
  *
  * @author Mark Paluch
+ * @author oscar.fanchin
  */
 @SuppressWarnings({ "UnreachableCode", "ConstantValue" })
 class HqlQueryIntrospector extends HqlBaseVisitor<Void> implements ParsedQueryIntrospector<HibernateQueryInformation> {
@@ -39,11 +40,12 @@ class HqlQueryIntrospector extends HqlBaseVisitor<Void> implements ParsedQueryIn
 	private boolean projectionProcessed;
 	private boolean hasConstructorExpression = false;
 	private boolean hasCte = false;
+	private boolean hasFromFunction = false;
 
 	@Override
 	public HibernateQueryInformation getParsedQueryInformation() {
 		return new HibernateQueryInformation(primaryFromAlias, projection == null ? Collections.emptyList() : projection,
-				hasConstructorExpression, hasCte);
+				hasConstructorExpression, hasCte, hasFromFunction);
 	}
 
 	@Override
@@ -62,6 +64,12 @@ public Void visitCte(HqlParser.CteContext ctx) {
 		this.hasCte = true;
 		return super.visitCte(ctx);
 	}
+	
+	@Override
+	public Void visitFunctionCallAsFromSource(HqlParser.FunctionCallAsFromSourceContext ctx) {
+		this.hasFromFunction = true;
+		return super.visitFunctionCallAsFromSource(ctx);
+	}
 
 	@Override
 	public Void visitFromRoot(HqlParser.FromRootContext ctx) {

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

@@ -31,6 +31,7 @@
  *
  * @author Greg Turnquist
  * @author Christoph Strobl
+ * @author Oscar Fanchin
  * @since 3.1
  */
 @SuppressWarnings({ "ConstantConditions", "DuplicatedCode", "UnreachableCode" })
@@ -63,6 +64,24 @@ public QueryTokenStream visitStart(HqlParser.StartContext ctx) {
 		return visit(ctx.ql_statement());
 	}
 
+	@Override
+	public QueryTokenStream visitFunctionCallAsFromSource(HqlParser.FunctionCallAsFromSourceContext ctx) {
+
+		QueryRendererBuilder builder = QueryRenderer.builder();
+
+		builder.append(visit(ctx.identifier()));
+
+		builder.append(TOKEN_OPEN_PAREN);
+
+		if (!ctx.expression().isEmpty()) {
+			builder.append(QueryTokenStream.concatExpressions(ctx.expression(), this::visit, TOKEN_COMMA));
+		}
+
+		builder.append(TOKEN_CLOSE_PAREN);
+
+		return builder;
+	}
+
 	@Override
 	public QueryTokenStream visitQl_statement(HqlParser.Ql_statementContext ctx) {
 
@@ -383,6 +402,14 @@ public QueryTokenStream visitFromRoot(HqlParser.FromRootContext ctx) {
 
 			builder.appendExpression(nested);
 
+			if (ctx.variable() != null) {
+				builder.appendExpression(visit(ctx.variable()));
+			}
+
+		} else if (ctx.functionCallAsFromSource() != null) {
+
+			builder.appendExpression(visit(ctx.functionCallAsFromSource()));
+
 			if (ctx.variable() != null) {
 				builder.appendExpression(visit(ctx.variable()));
 			}
@@ -448,6 +475,39 @@ public QueryTokenStream visitJoinSubquery(HqlParser.JoinSubqueryContext ctx) {
 		return builder;
 	}
 
+	@Override
+	public QueryTokenStream visitJoinFunctionCall(HqlParser.JoinFunctionCallContext ctx) {
+
+		QueryRendererBuilder builder = QueryRenderer.builder();
+
+		builder.append(visit(ctx.functionCallAsJoinTarget()));
+
+		if (ctx.variable() != null) {
+			builder.appendExpression(visit(ctx.variable()));
+		}
+
+		return builder;
+
+	}
+
+	@Override
+	public QueryTokenStream visitFunctionCallAsJoinTarget(HqlParser.FunctionCallAsJoinTargetContext ctx) {
+
+		QueryRendererBuilder builder = QueryRenderer.builder();
+
+		builder.append(visit(ctx.identifier()));
+
+		builder.append(TOKEN_OPEN_PAREN);
+
+		if (!ctx.expression().isEmpty()) {
+			builder.append(QueryTokenStream.concatExpressions(ctx.expression(), this::visit, TOKEN_COMMA));
+		}
+
+		builder.append(TOKEN_CLOSE_PAREN);
+
+		return builder;
+	}
+
 	@Override
 	public QueryTokenStream visitUpdateStatement(HqlParser.UpdateStatementContext ctx) {
 

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

@@ -31,6 +31,7 @@
  *
  * @author Greg Turnquist
  * @author Christoph Strobl
+ * @author oscar.fanchin
  * @since 3.1
  */
 @SuppressWarnings("ConstantValue")
@@ -121,6 +122,19 @@ public QueryTokenStream visitJoinSubquery(HqlParser.JoinSubqueryContext ctx) {
 
 		return tokens;
 	}
+	
+	@Override
+	public QueryTokenStream visitJoinFunctionCall(HqlParser.JoinFunctionCallContext ctx) {
+
+		QueryTokenStream tokens = super.visitJoinFunctionCall(ctx);
+
+		if (ctx.variable() != null && !tokens.isEmpty()) {
+			transformerSupport.registerAlias(tokens.getLast());
+		}
+
+		return tokens;
+	}
+	
 
 	@Override
 	public QueryTokenStream visitVariable(HqlParser.VariableContext ctx) {