[Nhibernate-commit] nhibernate/src/NHibernate/Hql FromParser.cs,1.8,1.9

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12090/src/NHibernate/Hql

Modified Files:
	FromParser.cs 
Log Message:
Fixed problem with collections in select

Index: FromParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/FromParser.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FromParser.cs	30 Apr 2004 08:57:59 -0000	1.8
--- FromParser.cs	13 Jul 2004 03:05:36 -0000	1.9
***************
*** 49,53 ****
  				if (!afterJoinType) 
  				{
! 					if (!expectingJoin|expectingAs) throw new QueryException("unexpected token: join");
  					// inner joings can be abbreviated to 'join'
  					joinType = JoinType.InnerJoin;
--- 49,53 ----
  				if (!afterJoinType) 
  				{
! 					if ( !(expectingJoin|expectingAs) ) throw new QueryException("unexpected token: join");
  					// inner joings can be abbreviated to 'join'
  					joinType = JoinType.InnerJoin;