[hibernate-commits] Hibernate SVN: r16386 - core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse.

[hibernate-commits at lists.jboss.org]

Author: porcelli
Date: 2009-04-21 13:47:46 -0400 (Tue, 21 Apr 2009)
New Revision: 16386

Modified:
   core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g
Log:
fixing TreeWalker to work with "new" aproach to collectionExpression

Modified: core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g
===================================================================
--- core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g	2009-04-21 17:33:51 UTC (rev 16385)
+++ core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g	2009-04-21 17:47:46 UTC (rev 16386)
@@ -143,7 +143,7 @@
 	;
 
 joins
-	:	^(PROPERTY_JOIN joinType FETCH? ALIAS_NAME PROP_FETCH? collectionExpression withClause?)
+	:	^(PROPERTY_JOIN joinType FETCH? ALIAS_NAME PROP_FETCH? (collectionExpression|propertyReference) withClause?)
 	|	^(PERSISTER_JOIN joinType persisterSpaceRoot onClause?)
 	;
 
@@ -258,7 +258,7 @@
 	:	caseExpression
 	|	function
 	|	collectionFunction
-	|	collectionExpressionSimple
+	|	collectionExpression
 	|	constant
 	|	parameter
 	|	propertyReference
@@ -434,7 +434,7 @@
 	;
 
 countFunctionArguments
-	:	collectionExpressionSimple
+	:	collectionExpression
 	|	propertyReference
 	|	numeric_literal
 	;
@@ -448,15 +448,9 @@
 	:	propertyReference
 	;
 
-collectionExpressionSimple
-	:	^(ELEMENTS propertyReference) //it will generate a SELECT m.column form Table xxx -> it is realted to Hibernate mappings to Table->Map
-	|	^(INDICES propertyReference)
-	;
-
 collectionExpression
 	:	^(ELEMENTS propertyReference) //it will generate a SELECT m.column form Table xxx -> it is realted to Hibernate mappings to Table->Map
 	|	^(INDICES propertyReference)
-	|	propertyReference
 	;
 
 parameter