nhibernate-commit

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

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

Modified Files:
	Loader.cs OuterJoinLoader.cs SimpleEntityLoader.cs 
Log Message:
I modified - a few thing :)


Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OuterJoinLoader.cs	2 Apr 2004 15:55:48 -0000	1.9
--- OuterJoinLoader.cs	15 Apr 2004 11:36:36 -0000	1.10
***************
*** 35,44 ****
  		protected SqlString sqlString;
  		protected string[] suffixes;
- 		private Dialect.Dialect dialect;
  
  		
! 		public OuterJoinLoader(Dialect.Dialect dialect) 
  		{
- 			this.dialect = dialect;
  		}
  
--- 35,42 ----
  		protected SqlString sqlString;
  		protected string[] suffixes;
  
  		
! 		public OuterJoinLoader(Dialect.Dialect dialect) : base(dialect)
  		{
  		}
  
***************
*** 442,446 ****
  
  			//TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed...
! 			return (new Alias(10, n.ToString() + StringHelper.Underscore)).ToAliasString(tableName);
  		}
  
--- 440,444 ----
  
  			//TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed...
! 			return (new Alias(10, n.ToString() + StringHelper.Underscore)).ToAliasString(tableName, dialect);
  		}
  

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Loader.cs	2 Apr 2004 15:55:48 -0000	1.16
--- Loader.cs	15 Apr 2004 11:36:36 -0000	1.17
***************
*** 25,28 ****
--- 25,34 ----
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Loader));
+ 		public Dialect.Dialect dialect;
+ 
+ 		protected Loader(Dialect.Dialect dialect)
+ 		{
+ 			this.dialect = dialect;
+ 		}
  
  		/// <summary>
***************
*** 879,883 ****
  		private string[] GetKeyAliases(string suffix, ILoadable persister) 
  		{
! 			return new Alias(suffix).ToUnquotedAliasStrings(persister.IdentifierColumnNames);
  		}
  
--- 885,889 ----
  		private string[] GetKeyAliases(string suffix, ILoadable persister) 
  		{
! 			return new Alias(suffix).ToUnquotedAliasStrings(persister.IdentifierColumnNames, dialect);
  		}
  
***************
*** 888,892 ****
  			for(int i = 0; i < size; i++) 
  			{
! 				result[i] = new Alias(suffix).ToUnquotedAliasStrings(persister.GetPropertyColumnNames(i));
  			}
  			return result;
--- 894,898 ----
  			for(int i = 0; i < size; i++) 
  			{
! 				result[i] = new Alias(suffix).ToUnquotedAliasStrings(persister.GetPropertyColumnNames(i), dialect);
  			}
  			return result;
***************
*** 896,900 ****
  		{
  			return persister.HasSubclasses ?
! 				new Alias(suffix).ToUnquotedAliasString(persister.DiscriminatorColumnName) : null;
  		}
  
--- 902,906 ----
  		{
  			return persister.HasSubclasses ?
! 				new Alias(suffix).ToUnquotedAliasString(persister.DiscriminatorColumnName, dialect) : null;
  		}
  

Index: SimpleEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/SimpleEntityLoader.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleEntityLoader.cs	2 Apr 2004 15:55:48 -0000	1.5
--- SimpleEntityLoader.cs	15 Apr 2004 11:36:36 -0000	1.6
***************
*** 25,29 ****
  		private string[] NoSuffix = new string[] { String.Empty };
  
! 		public SimpleEntityLoader(ILoadable persister, SqlString sqlString, LockMode lockMode) 
  		{
  			this.persister = new ILoadable[] { persister };
--- 25,29 ----
  		private string[] NoSuffix = new string[] { String.Empty };
  
! 		public SimpleEntityLoader(ILoadable persister, SqlString sqlString, LockMode lockMode, Dialect.Dialect d) : base(d)
  		{
  			this.persister = new ILoadable[] { persister };