[Hibernate-commits] Hibernate Code SVN: r10164 - in branches/Branch_3_2/Hibernate3: grammar test/org/hibernate/test/hql

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-07-26 11:09:20 -0400 (Wed, 26 Jul 2006)
New Revision: 10164

Modified:
   branches/Branch_3_2/Hibernate3/grammar/hql.g
   branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HqlParserTest.java
Log:
ported fix for HHH-1947 to 3.2 branch

Modified: branches/Branch_3_2/Hibernate3/grammar/hql.g
===================================================================
--- branches/Branch_3_2/Hibernate3/grammar/hql.g	2006-07-26 15:07:50 UTC (rev 10163)
+++ branches/Branch_3_2/Hibernate3/grammar/hql.g	2006-07-26 15:09:20 UTC (rev 10164)
@@ -521,7 +521,7 @@
 					#l.setText( (n == null) ? "like" : "not like");
 				}
 				concatenation likeEscape)
-			| (MEMBER! OF! p:path! {
+			| (MEMBER! (OF!)? p:path! {
 				processMemberOf(n,#p,currentAST);
 			  } ) )
 		)

Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HqlParserTest.java
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HqlParserTest.java	2006-07-26 15:07:50 UTC (rev 10163)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HqlParserTest.java	2006-07-26 15:09:20 UTC (rev 10164)
@@ -929,6 +929,7 @@
 
 	public void testEjbqlExtensions() throws Exception {
 		parse( "select object(a) from Animal a where a.mother member of a.offspring" );
+		parse( "select object(a) from Animal a where a.mother member a.offspring" );
 		parse( "select object(a) from Animal a where a.offspring is empty" );
 	}