[Nhibernate-commit] nhibernate/src/NHibernate/Hql ClauseParser.cs,1.4,1.5 FilterTranslator.cs,1.5,1.6 HavingParser.cs,1.4,1.5 QueryTranslator.cs,1.23,1.24 WhereParser.cs,1.10,1.11

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

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

Modified Files:
	ClauseParser.cs FilterTranslator.cs HavingParser.cs 
	QueryTranslator.cs WhereParser.cs 
Log Message:
I modified - a few thing :)


Index: ClauseParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/ClauseParser.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClauseParser.cs	14 Apr 2004 11:35:53 -0000	1.4
--- ClauseParser.cs	15 Apr 2004 11:36:35 -0000	1.5
***************
*** 51,55 ****
  				{
  					EndChild(q);
! 					child = new WhereParser();
  					child.Start(q);
  				} 
--- 51,55 ----
  				{
  					EndChild(q);
! 					child = new WhereParser(q.dialect);
  					child.Start(q);
  				} 
***************
*** 63,67 ****
  				{
  					EndChild(q);
! 					child = new HavingParser();
  					child.Start(q);
  				} 
--- 63,67 ----
  				{
  					EndChild(q);
! 					child = new HavingParser(q.dialect);
  					child.Start(q);
  				} 

Index: WhereParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/WhereParser.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WhereParser.cs	14 Apr 2004 12:34:00 -0000	1.10
--- WhereParser.cs	15 Apr 2004 11:36:35 -0000	1.11
***************
*** 33,39 ****
  		private static StringCollection booleanOperators = new StringCollection(); //tokens that would indicate a sub expression is a boolean expression
  		private static IDictionary negations = new Hashtable();
  
! 		public WhereParser()
  		{
  			pathExpressionParser.UseThetaStyleJoin = true;
  		}
--- 33,41 ----
  		private static StringCollection booleanOperators = new StringCollection(); //tokens that would indicate a sub expression is a boolean expression
  		private static IDictionary negations = new Hashtable();
+ 		private Dialect.Dialect d;
  
! 		public WhereParser(Dialect.Dialect d)
  		{
+ 			this.d = d;
  			pathExpressionParser.UseThetaStyleJoin = true;
  		}
***************
*** 244,248 ****
  				if (bracketsSinceSelect == - 1) 
  				{
! 					QueryTranslator subq = new QueryTranslator();
  					try 
  					{
--- 246,250 ----
  				if (bracketsSinceSelect == - 1) 
  				{
! 					QueryTranslator subq = new QueryTranslator(d);
  					try 
  					{

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** QueryTranslator.cs	14 Apr 2004 14:48:47 -0000	1.23
--- QueryTranslator.cs	15 Apr 2004 11:36:35 -0000	1.24
***************
*** 84,88 ****
  		/// Construct a query translator
  		/// </summary>
! 		public QueryTranslator() 
  		{
  		}
--- 84,88 ----
  		/// Construct a query translator
  		/// </summary>
! 		public QueryTranslator(Dialect.Dialect d) : base(d)
  		{
  		}

Index: HavingParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/HavingParser.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HavingParser.cs	14 Apr 2004 11:35:53 -0000	1.4
--- HavingParser.cs	15 Apr 2004 11:36:35 -0000	1.5
***************
*** 8,11 ****
--- 8,14 ----
  	public class HavingParser : WhereParser {
  		
+ 		public HavingParser(Dialect.Dialect d) : base(d)
+ 		{
+ 		}
  		protected override void AppendToken(QueryTranslator q, string token) {
  			q.AppendHavingToken(token);

Index: FilterTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/FilterTranslator.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FilterTranslator.cs	14 Apr 2004 11:35:53 -0000	1.5
--- FilterTranslator.cs	15 Apr 2004 11:36:35 -0000	1.6
***************
*** 9,12 ****
--- 9,16 ----
  	public class FilterTranslator : QueryTranslator {
  		
+ 		public FilterTranslator(Dialect.Dialect d) : base(d)
+ 		{
+ 		}
+ 
  		/// <summary> Compile a filter. This method may be called multiple
  		/// times. Subsequent invocations are no-ops.