[Nhibernate-commit] nhibernate/src/NHibernate/Hql WhereParser.cs,1.11,1.12

[Peter S. <sz...@us...>]

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

Modified Files:
	WhereParser.cs 
Log Message:
HQL...


Index: WhereParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/WhereParser.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** WhereParser.cs	15 Apr 2004 11:36:35 -0000	1.11
--- WhereParser.cs	30 Apr 2004 09:35:40 -0000	1.12
***************
*** 150,156 ****
  		private ArrayList joins = new ArrayList(); //the join string built up by compound paths inside this expression
  		private ArrayList booleanTests = new ArrayList();//a flag indicating if the subexpression is known to be boolean		
! 		
! 
! 
  		private string GetElementName(PathExpressionParser.CollectionElement element, QueryTranslator q) 
  		{
--- 150,154 ----
  		private ArrayList joins = new ArrayList(); //the join string built up by compound paths inside this expression
  		private ArrayList booleanTests = new ArrayList();//a flag indicating if the subexpression is known to be boolean		
! 	
  		private string GetElementName(PathExpressionParser.CollectionElement element, QueryTranslator q) 
  		{
***************
*** 202,206 ****
  			if (expectingPathContinuation) 
  			{
- 				
  				expectingPathContinuation = false;
  				
--- 200,203 ----
***************
*** 232,236 ****
  			}
  			
- 			
  			//Cope with a subselect
  			
--- 229,232 ----
***************
*** 392,396 ****
  		private void DoPathExpression(string token, QueryTranslator q) 
  		{
- 
  			Preprocess( token, q );
  
--- 388,391 ----
***************
*** 433,444 ****
  		private void DoToken(string token, QueryTranslator q) 
  		{
! 			if (q.IsName(StringHelper.Root(token))) 
! 			{ //path expression
  				DoPathExpression(q.Unalias(token), q);
  			} 
! 			else if (token.StartsWith(ParserHelper.HqlVariablePrefix)) 
  			{
- 				//named query parameter
  				q.AddNamedParameter(token.Substring(1));
  				AppendToken(q, "[<" + token.Substring(1) + ">]"); // THEO
  			} 
--- 428,439 ----
  		private void DoToken(string token, QueryTranslator q) 
  		{
! 			if (q.IsName(StringHelper.Root(token))) //path expression
! 			{
  				DoPathExpression(q.Unalias(token), q);
  			} 
! 			else if (token.StartsWith(ParserHelper.HqlVariablePrefix)) //named query parameter
  			{
  				q.AddNamedParameter(token.Substring(1));
+ 				//TODO: H2.0.3 why token is not '?' ??
  				AppendToken(q, "[<" + token.Substring(1) + ">]"); // THEO
  			} 
***************
*** 446,451 ****
  			{
  				IQueryable p = q.GetPersisterUsingImports(token);
! 				if (p != null) 
! 				{ // the name of a class
  					AppendToken(q, p.DiscriminatorSQLString);
  				} 
--- 441,446 ----
  			{
  				IQueryable p = q.GetPersisterUsingImports(token);
! 				if (p != null) // the name of a class
! 				{
  					AppendToken(q, p.DiscriminatorSQLString);
  				} 
***************
*** 454,458 ****
  					object constant;
  
! 					if (	token.IndexOf((System.Char) StringHelper.Dot) > - 1 &&
  						(constant = ReflectHelper.GetConstantValue(token)) != null)	
  					{
--- 449,453 ----
  					object constant;
  
! 					if ( token.IndexOf((System.Char) StringHelper.Dot) > - 1 &&
  						(constant = ReflectHelper.GetConstantValue(token)) != null)	
  					{