[hibernate-commits] Hibernate SVN: r20162 - core/branches/Branch_3_5/core/src/main/antlr.

Author: steve.ebersole(a)jboss.com Date: 2010-08-18 13:26:39 -0400 (Wed, 18 Aug 2010) New Revision: 20162 Modified: core/branches/Branch_3_5/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/branches/Branch_3_5/core/src/main/antlr/hql-sql.g =================================================================== --- core/branches/Branch_3_5/core/src/main/antlr/hql-sql.g 2010-08-18 17:05:44 UTC (rev 20161) +++ core/branches/Branch_3_5/core/src/main/antlr/hql-sql.g 2010-08-18 17:26:39 UTC (rev 20162) @@ -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 ) ;