[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand ForUpdateFragment.cs,1.2,1.3 Template.cs,1.5,1.6

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

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

Modified Files:
	ForUpdateFragment.cs Template.cs 
Log Message:
Some small H2.0.3 compatibility fix


Index: Template.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Template.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Template.cs	28 Apr 2004 14:20:03 -0000	1.5
--- Template.cs	29 Apr 2004 14:00:53 -0000	1.6
***************
*** 17,21 ****
  
  		private static StringDictionary Keywords = new StringDictionary();
- 		private static readonly string empty = "";
  		public static readonly string PlaceHolder = "$PlaceHolder";
  		private static ArrayList delimiterList = new ArrayList(13);
--- 17,20 ----
***************
*** 24,42 ****
  		static Template() 
  		{
! 			Keywords["and"] = empty;
! 			Keywords["or"] = empty;
! 			Keywords["not"] = empty;
! 			Keywords["like"] = empty;
! 			Keywords["is"] = empty;
! 			Keywords["in"] = empty;
! 			Keywords["between"] = empty;
! 			Keywords["null"] = empty;
! 			Keywords["select"] = empty;
! 			Keywords["from"] = empty;
! 			Keywords["where"] = empty;
! 			Keywords["having"] = empty;
! 			Keywords["group"] = empty;
! 			Keywords["order"] = empty;
! 			Keywords["by"] = empty;
  
  			delimiterList.Add(" ");
--- 23,41 ----
  		static Template() 
  		{
! 			Keywords["and"] = string.Empty;
! 			Keywords["or"] = string.Empty;
! 			Keywords["not"] = string.Empty;
! 			Keywords["like"] = string.Empty;
! 			Keywords["is"] = string.Empty;
! 			Keywords["in"] = string.Empty;
! 			Keywords["between"] = string.Empty;
! 			Keywords["null"] = string.Empty;
! 			Keywords["select"] = string.Empty;
! 			Keywords["from"] = string.Empty;
! 			Keywords["where"] = string.Empty;
! 			Keywords["having"] = string.Empty;
! 			Keywords["group"] = string.Empty;
! 			Keywords["order"] = string.Empty;
! 			Keywords["by"] = string.Empty;
  
  			delimiterList.Add(" ");
***************
*** 71,75 ****
  		public static void AddKeyword(string keyword) 
  		{
! 			Keywords[keyword] = empty;
  		}
  
--- 70,74 ----
  		public static void AddKeyword(string keyword) 
  		{
! 			Keywords[keyword] = string.Empty;
  		}
  

Index: ForUpdateFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/ForUpdateFragment.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ForUpdateFragment.cs	18 Mar 2004 18:34:47 -0000	1.2
--- ForUpdateFragment.cs	29 Apr 2004 14:00:53 -0000	1.3
***************
*** 38,43 ****
  		{
  			return aliases.Length==0 ?
! 				new SqlString("") :
! 				new SqlString(" for update of " + aliases + ( nowait ? " nowait" : "")); 
  		}
  
--- 38,43 ----
  		{
  			return aliases.Length==0 ?
! 				new SqlString(string.Empty) :
! 				new SqlString(" for update of " + aliases + ( nowait ? " nowait" : string.Empty)); 
  		}