[hibernate-commits] Hibernate SVN: r20163 - core/trunk/core/src/main/antlr.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-08-18 13:27:40 -0400 (Wed, 18 Aug 2010)
New Revision: 20163

Modified:
   core/trunk/core/src/main/antlr/hql-sql.g
Log:
HHH-1643 - Sub-query as function parameter - either sub-query is missed from SQL or NullPointerException raised


Modified: core/trunk/core/src/main/antlr/hql-sql.g
===================================================================
--- core/trunk/core/src/main/antlr/hql-sql.g	2010-08-18 17:26:39 UTC (rev 20162)
+++ core/trunk/core/src/main/antlr/hql-sql.g	2010-08-18 17:27:40 UTC (rev 20163)
@@ -582,8 +582,10 @@
 	;
 
 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 )
 	;