From cf2cab9e18ed10a3c7d00a96494052d7b70b4372 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 18 Aug 2010 17:27:40 +0000
Subject: [PATCH] HHH-1643 - Sub-query as function parameter - either sub-query
 is missed from SQL or NullPointerException raised

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20163 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 core/src/main/antlr/hql-sql.g | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/antlr/hql-sql.g b/core/src/main/antlr/hql-sql.g
index 8bb359be50..a86564ae8c 100644
--- a/core/src/main/antlr/hql-sql.g
+++ b/core/src/main/antlr/hql-sql.g
@@ -582,8 +582,10 @@ collectionFunction
 	;
 
 functionCall
-	: #(METHOD_CALL  {inFunctionCall=true;} pathAsIdent ( #(EXPR_LIST (expr)* ) )? )
-		{ processFunction(#functionCall,inSelect); } {inFunctionCall=false;}
+	: #(METHOD_CALL  {inFunctionCall=true;} pathAsIdent ( #(EXPR_LIST (exprOrSubquery)* ) )? ) {
+        processFunction( #functionCall, inSelect );
+        inFunctionCall=false;
+    }
 	| #(AGGREGATE aggregateExpr )
 	;