nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate/Loader Loader.cs,1.42,1.43

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

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

Modified Files:
	Loader.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Loader.cs	30 Nov 2004 18:36:51 -0000	1.42
--- Loader.cs	4 Dec 2004 22:41:21 -0000	1.43
***************
*** 631,635 ****
  			{
  				ClosePreparedCommand(command, null, session);
! 				throw sqle;
  			}
  
--- 631,635 ----
  			{
  				ClosePreparedCommand(command, null, session);
! 				throw;
  			}
  
***************
*** 693,697 ****
  			{
  				ClosePreparedCommand(st, rs, session);
! 				throw sqle;
  			}
  		}
--- 693,697 ----
  			{
  				ClosePreparedCommand(st, rs, session);
! 				throw;
  			}
  		}

[Nhibernate-commit] nhibernate/src/NHibernate/Impl BatcherImpl.cs,1.11,1.12 SessionImpl.cs,1.53,1.54

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

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

Modified Files:
	BatcherImpl.cs SessionImpl.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** SessionImpl.cs	30 Nov 2004 18:36:50 -0000	1.53
--- SessionImpl.cs	4 Dec 2004 22:41:21 -0000	1.54
***************
*** 6,9 ****
--- 6,11 ----
  using System.Text.RegularExpressions;
  
+ using Iesi.Collections;
+ 
  using NHibernate.Cache;
  using NHibernate.Collection;
***************
*** 52,56 ****
  		private IdentityMap collections; //key=PersistentCollection, value=CollectionEntry
  		
! 		private IDictionary nullifiables = new Hashtable();  //set of Keys of deleted objects
  
  		private IInterceptor interceptor;
--- 54,58 ----
  		private IdentityMap collections; //key=PersistentCollection, value=CollectionEntry
  		
! 		private ISet nullifiables = new HashedSet();  //set of Keys of deleted objects
  
  		private IInterceptor interceptor;
***************
*** 627,631 ****
  			this.entitiesByKey = (IDictionary)info.GetValue( "entitiesByKey", typeof(IDictionary) );
  			this.proxiesByKey = (IDictionary)info.GetValue( "proxiesByKey", typeof(IDictionary) );
! 			this.nullifiables = (IDictionary)info.GetValue( "nullifiables", typeof(IDictionary) );
  			this.interceptor = (IInterceptor)info.GetValue( "interceptor", typeof(IInterceptor) );
  
--- 629,633 ----
  			this.entitiesByKey = (IDictionary)info.GetValue( "entitiesByKey", typeof(IDictionary) );
  			this.proxiesByKey = (IDictionary)info.GetValue( "proxiesByKey", typeof(IDictionary) );
! 			this.nullifiables = (ISet)info.GetValue( "nullifiables", typeof(ISet) );
  			this.interceptor = (IInterceptor)info.GetValue( "interceptor", typeof(IInterceptor) );
  
***************
*** 662,666 ****
  			info.AddValue( "entitiesByKey", entitiesByKey, typeof(IDictionary) );
  			info.AddValue( "proxiesByKey", proxiesByKey, typeof(IDictionary) );
! 			info.AddValue( "nullifiables", nullifiables, typeof(IDictionary) );
  			info.AddValue( "interceptor", interceptor, typeof(IInterceptor) );
  
--- 664,668 ----
  			info.AddValue( "entitiesByKey", entitiesByKey, typeof(IDictionary) );
  			info.AddValue( "proxiesByKey", proxiesByKey, typeof(IDictionary) );
! 			info.AddValue( "nullifiables", nullifiables, typeof(ISet) );
  			info.AddValue( "interceptor", interceptor, typeof(IInterceptor) );
  
***************
*** 1396,1409 ****
  			NullifyTransientReferences(entry.DeletedState, propTypes, false, obj);
  
! 			// in h2.0.3 this is a Set
! 			IDictionary oldNullifiables = null;
  			ArrayList oldDeletions = null;
  			if ( persister.HasCascades ) 
  			{
! 				oldNullifiables = new Hashtable(nullifiables);
  				oldDeletions = (ArrayList) deletions.Clone();
  			}
  
! 			nullifiables[ new Key(entry.Id, persister) ] = new object();
  			entry.Status = Status.Deleted; // before any callbacks, etc, so subdeletions see that this deletion happend first
  			ScheduledDeletion delete = new ScheduledDeletion(entry.Id, version, obj, persister, this);
--- 1398,1411 ----
  			NullifyTransientReferences(entry.DeletedState, propTypes, false, obj);
  
! 			ISet oldNullifiables = null;
  			ArrayList oldDeletions = null;
  			if ( persister.HasCascades ) 
  			{
! 				oldNullifiables = new HashedSet( );
! 				oldNullifiables.AddAll( nullifiables );
  				oldDeletions = (ArrayList) deletions.Clone();
  			}
  
! 			nullifiables.Add( new Key(entry.Id, persister) );
  			entry.Status = Status.Deleted; // before any callbacks, etc, so subdeletions see that this deletion happend first
  			ScheduledDeletion delete = new ScheduledDeletion(entry.Id, version, obj, persister, this);
***************
*** 1429,1433 ****
  					int start = deletions.Count;
  
! 					IDictionary newNullifiables = nullifiables;
  					nullifiables = oldNullifiables;
  
--- 1431,1435 ----
  					int start = deletions.Count;
  
! 					ISet newNullifiables = nullifiables;
  					nullifiables = oldNullifiables;
  
***************
*** 1441,1448 ****
  					{
  						cascading--;
! 						foreach(DictionaryEntry oldNullifyDictEntry in oldNullifiables) 
! 						{
! 							newNullifiables[oldNullifyDictEntry.Key] = oldNullifyDictEntry.Value;
! 						}
  						nullifiables = newNullifiables;
  					}
--- 1443,1447 ----
  					{
  						cascading--;
! 						newNullifiables.AddAll( oldNullifiables );
  						nullifiables = newNullifiables;
  					}
***************
*** 1866,1874 ****
  			// take the union of the query spaces (ie the queried tables)
  			QueryTranslator[] q = new QueryTranslator[concreteQueries.Length];
! 			ArrayList qs = new ArrayList();
  			for (int i=0; i<concreteQueries.Length; i++ ) 
  			{
  				q[i] = scalar ? factory.GetShallowQuery( concreteQueries[i] ) : factory.GetQuery( concreteQueries[i] );
! 				qs.AddRange( q[i].QuerySpaces );
  			}
  
--- 1865,1873 ----
  			// take the union of the query spaces (ie the queried tables)
  			QueryTranslator[] q = new QueryTranslator[concreteQueries.Length];
! 			HashedSet qs = new HashedSet();
  			for (int i=0; i<concreteQueries.Length; i++ ) 
  			{
  				q[i] = scalar ? factory.GetShallowQuery( concreteQueries[i] ) : factory.GetQuery( concreteQueries[i] );
! 				qs.AddAll( q[i].QuerySpaces );
  			}
  
***************
*** 2040,2044 ****
  		/// <param name="querySpaces"></param>
  		/// <returns></returns>
! 		private bool AutoFlushIfRequired(IList querySpaces) 
  		{
  
--- 2039,2043 ----
  		/// <param name="querySpaces"></param>
  		/// <returns></returns>
! 		private bool AutoFlushIfRequired(ISet querySpaces) 
  		{
  
***************
*** 2620,2624 ****
  		}
  
! 		private bool AreTablesToBeUpdated(IList tables) 
  		{
  			return AreTablesToUpdated( updates, tables) ||
--- 2619,2623 ----
  		}
  
! 		private bool AreTablesToBeUpdated(ISet tables) 
  		{
  			return AreTablesToUpdated( updates, tables) ||
***************
*** 2630,2634 ****
  		}
  
! 		private bool AreTablesToUpdated(ICollection coll, IList theSet) 
  		{
  			foreach( IExecutable executable in coll ) 
--- 2629,2633 ----
  		}
  
! 		private bool AreTablesToUpdated(ICollection coll, ISet theSet) 
  		{
  			foreach( IExecutable executable in coll ) 
***************
*** 4026,4030 ****
  			CriteriaLoader loader = new CriteriaLoader(persister, factory, criteria);
  			object[] spaces = persister.PropertySpaces;
! 			ArrayList sett = new ArrayList();
  			for (int i=0; i<spaces.Length; i++) 
  			{
--- 4025,4029 ----
  			CriteriaLoader loader = new CriteriaLoader(persister, factory, criteria);
  			object[] spaces = persister.PropertySpaces;
! 			HashedSet sett = new HashedSet();
  			for (int i=0; i<spaces.Length; i++) 
  			{

Index: BatcherImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/BatcherImpl.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BatcherImpl.cs	29 Oct 2004 05:53:49 -0000	1.11
--- BatcherImpl.cs	4 Dec 2004 22:41:20 -0000	1.12
***************
*** 3,6 ****
--- 3,8 ----
  using System.Data;
  
+ using Iesi.Collections;
+ 
  using NHibernate.Driver;
  using NHibernate.Engine;
***************
*** 28,33 ****
  		private SqlString batchCommandSql;
  
! 		private ArrayList commandsToClose = new ArrayList();
! 		private ArrayList readersToClose = new ArrayList();
  
  		public BatcherImpl(ISessionImplementor session) 
--- 30,35 ----
  		private SqlString batchCommandSql;
  
! 		private ISet commandsToClose = new HashedSet();
! 		private ISet readersToClose = new HashedSet();
  
  		public BatcherImpl(ISessionImplementor session) 
***************
*** 199,207 ****
  			}
  
! 			for( int i=0; i<readersToClose.Count; i++ ) 
  			{
! 				((NHybridDataReader)readersToClose[i]).ReadIntoMemory();
  			}
- 			
  		}
  
--- 201,208 ----
  			}
  
! 			foreach( NHybridDataReader reader in readersToClose ) 
  			{
! 				reader.ReadIntoMemory();
  			}
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Collection CollectionPersister.cs,1.29,1.30

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

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

Modified Files:
	CollectionPersister.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: CollectionPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/CollectionPersister.cs,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** CollectionPersister.cs	30 Nov 2004 18:36:49 -0000	1.29
--- CollectionPersister.cs	4 Dec 2004 22:41:18 -0000	1.30
***************
*** 1,6 ****
  using System;
- using System.Text;
- using System.Data;
  using System.Collections;
  
  using NHibernate.Cache;
--- 1,8 ----
  using System;
  using System.Collections;
+ using System.Data;
+ using System.Text;
+ 
+ using Iesi.Collections;
  
  using NHibernate.Cache;
***************
*** 114,118 ****
  			}
  			keyColumnAliases = alias.ToAliasStrings(keyAliases, dialect);
! 			IList distinctColumns = new ArrayList();
  			CheckColumnDuplication( distinctColumns, collection.Key.ColumnCollection );
  
--- 116,120 ----
  			}
  			keyColumnAliases = alias.ToAliasStrings(keyAliases, dialect);
! 			ISet distinctColumns = new HashedSet();
  			CheckColumnDuplication( distinctColumns, collection.Key.ColumnCollection );
  
***************
*** 951,955 ****
  		}
  
! 		private void CheckColumnDuplication(IList distinctColumns, ICollection columns) 
  		{
  			foreach(Column col in columns) 
--- 953,957 ----
  		}
  
! 		private void CheckColumnDuplication(ISet distinctColumns, ICollection columns) 
  		{
  			foreach(Column col in columns) 

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Configuration.cs,1.23,1.24

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

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

Modified Files:
	Configuration.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Configuration.cs	31 Oct 2004 04:25:57 -0000	1.23
--- Configuration.cs	4 Dec 2004 22:41:18 -0000	1.24
***************
*** 1,5 ****
  using System;
  using System.Collections;
- using System.Collections.Specialized;
  using System.IO;
  using System.Reflection;
--- 1,4 ----
***************
*** 199,203 ****
  			{
  				log.Error("Could not compile the mapping document", me);
! 				throw me;
  			}
  		}
--- 198,202 ----
  			{
  				log.Error("Could not compile the mapping document", me);
! 				throw;
  			}
  		}
***************
*** 226,230 ****
  			catch (MappingException me) 
  			{
! 				throw me;
  			} 
  			catch (Exception e) 
--- 225,229 ----
  			catch (MappingException me) 
  			{
! 				throw;
  			} 
  			catch (Exception e) 
***************
*** 335,339 ****
  					catch (MappingException me) 
  					{
! 						throw me;
  					} 
  					catch (Exception e) 
--- 334,338 ----
  					catch (MappingException me) 
  					{
! 						throw;
  					} 
  					catch (Exception e) 

[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand Parameter.cs,1.10,1.11 QuerySelect.cs,1.2,1.3 Template.cs,1.9,1.10

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

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

Modified Files:
	Parameter.cs QuerySelect.cs Template.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: QuerySelect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/QuerySelect.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QuerySelect.cs	22 Nov 2004 03:56:08 -0000	1.2
--- QuerySelect.cs	4 Dec 2004 22:41:30 -0000	1.3
***************
*** 3,6 ****
--- 3,8 ----
  using System.Collections;
  
+ using Iesi.Collections;
+ 
  using NHibernate.Dialect;
  using NHibernate.Util;
***************
*** 26,58 ****
  		private bool distinct = false;
  
! 		private static readonly IList dontSpace = new ArrayList();
  
  		static QuerySelect() 
  		{
  			//dontSpace.add("'");
! 			dontSpace.Add(".");
! 			dontSpace.Add("+");
! 			dontSpace.Add("-");
! 			dontSpace.Add("/");
! 			dontSpace.Add("*");
! 			dontSpace.Add("<");
! 			dontSpace.Add(">");
! 			dontSpace.Add("=");
! 			dontSpace.Add("#");
! 			dontSpace.Add("~");
! 			dontSpace.Add("|");
! 			dontSpace.Add("&");
! 			dontSpace.Add("<=");
! 			dontSpace.Add(">=");
! 			dontSpace.Add("=>");
! 			dontSpace.Add("=<");
! 			dontSpace.Add("!=");
! 			dontSpace.Add("<>");
! 			dontSpace.Add("!#");
! 			dontSpace.Add("!~");
! 			dontSpace.Add("!<");
! 			dontSpace.Add("!>");
! 			dontSpace.Add(StringHelper.OpenParen); //for MySQL
! 			dontSpace.Add(StringHelper.ClosedParen);
  		}
  
--- 28,97 ----
  		private bool distinct = false;
  
! 		/// <summary>
! 		/// Certain databases don't like spaces around these operators.
! 		/// </summary>
! 		/// <remarks>
! 		/// This needs to contain both a plain string and a 
! 		/// SqlString version of the operator because the portions in 
! 		/// the WHERE clause will come in as SqlStrings since there
! 		/// might be parameters, other portions of the clause come in
! 		/// as strings since there are no parameters.
! 		/// </remarks>
! 		private static readonly ISet dontSpace = new HashedSet();
  
  		static QuerySelect() 
  		{
  			//dontSpace.add("'");
! 			dontSpace.Add( "." );
! 			dontSpace.Add( "+" );
! 			dontSpace.Add( "-" );
! 			dontSpace.Add( "/" );
! 			dontSpace.Add( "*" );
! 			dontSpace.Add( "<" );
! 			dontSpace.Add( ">" );
! 			dontSpace.Add( "=" );
! 			dontSpace.Add( "#" );
! 			dontSpace.Add( "~" );
! 			dontSpace.Add( "|" );
! 			dontSpace.Add( "&" );
! 			dontSpace.Add( "<=" );
! 			dontSpace.Add( ">=" );
! 			dontSpace.Add( "=>" );
! 			dontSpace.Add( "=<" );
! 			dontSpace.Add( "!=" );
! 			dontSpace.Add( "<>" );
! 			dontSpace.Add( "!#" );
! 			dontSpace.Add( "!~" );
! 			dontSpace.Add( "!<" );
! 			dontSpace.Add( "!>" );
! 			// MySQL doesn't like spaces around "(" or ")" also.
! 			dontSpace.Add( StringHelper.OpenParen ); 
! 			dontSpace.Add( StringHelper.ClosedParen );
! 
! 			dontSpace.Add( new SqlString( "." ) );
! 			dontSpace.Add( new SqlString( "+" ) );
! 			dontSpace.Add( new SqlString( "-" ) );
! 			dontSpace.Add( new SqlString( "/" ) );
! 			dontSpace.Add( new SqlString( "*" ) );
! 			dontSpace.Add( new SqlString( "<" ) );
! 			dontSpace.Add( new SqlString( ">" ) );
! 			dontSpace.Add( new SqlString( "=" ) );
! 			dontSpace.Add( new SqlString( "#" ) );
! 			dontSpace.Add( new SqlString( "~" ) );
! 			dontSpace.Add( new SqlString( "|" ) );
! 			dontSpace.Add( new SqlString( "&" ) );
! 			dontSpace.Add( new SqlString( "<=" ) );
! 			dontSpace.Add( new SqlString( ">=" ) );
! 			dontSpace.Add( new SqlString( "=>" ) );
! 			dontSpace.Add( new SqlString( "=<" ) );
! 			dontSpace.Add( new SqlString( "!=" ) );
! 			dontSpace.Add( new SqlString( "<>" ) );
! 			dontSpace.Add( new SqlString( "!#" ) );
! 			dontSpace.Add( new SqlString( "!~" ) );
! 			dontSpace.Add( new SqlString( "!<" ) );
! 			dontSpace.Add( new SqlString( "!>" ) );
! 			// MySQL doesn't like spaces around "(" or ")" also.
! 			dontSpace.Add( new SqlString( StringHelper.OpenParen ) ); 
! 			dontSpace.Add( new SqlString( StringHelper.ClosedParen ) );
  		}
  
***************
*** 157,161 ****
  			
  			SqlString part1 = joins.ToWhereFragmentString.Trim();
! 			SqlString  part2 =  whereBuilder.ToSqlString().Trim();
  			bool hasPart1 = part1.SqlParts.Length > 0;
  			bool hasPart2 = part2.SqlParts.Length > 0;
--- 196,200 ----
  			
  			SqlString part1 = joins.ToWhereFragmentString.Trim();
! 			SqlString part2 =  whereBuilder.ToSqlString().Trim();
  			bool hasPart1 = part1.SqlParts.Length > 0;
  			bool hasPart2 = part2.SqlParts.Length > 0;
***************
*** 244,248 ****
  				debugIndex++;
  
! 				if( tokenString!=null) 
  				{
  					lastQuoted = tokenString.EndsWith("'");
--- 283,287 ----
  				debugIndex++;
  
! 				if( tokenString!=null ) 
  				{
  					lastQuoted = tokenString.EndsWith("'");
***************
*** 250,254 ****
  				else 
  				{
! 					tokenSqlString.EndsWith("'");
  				}
  			}
--- 289,293 ----
  				else 
  				{
! 					lastQuoted = tokenSqlString.EndsWith("'");
  				}
  			}

Index: Template.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Template.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Template.cs	22 Nov 2004 03:56:08 -0000	1.9
--- Template.cs	4 Dec 2004 22:41:30 -0000	1.10
***************
*** 1,7 ****
  using System;
  using System.Collections;
- using System.Collections.Specialized;
  using System.Text;
  
  using NHibernate.Dialect;
  using NHibernate.Util;
--- 1,8 ----
  using System;
  using System.Collections;
  using System.Text;
  
+ using Iesi.Collections;
+ 
  using NHibernate.Dialect;
  using NHibernate.Util;
***************
*** 17,21 ****
  		public const string PlaceHolder = "$PlaceHolder";
  		
! 		private static StringDictionary Keywords = new StringDictionary();
  		private static ArrayList delimiterList = new ArrayList(13);
  		private static string delimiters = null;
--- 18,22 ----
  		public const string PlaceHolder = "$PlaceHolder";
  		
! 		private static ISet Keywords = new HashedSet();
  		private static ArrayList delimiterList = new ArrayList(13);
  		private static string delimiters = null;
***************
*** 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(" ");
--- 24,42 ----
  		static Template() 
  		{
! 			Keywords.Add( "and" );
! 			Keywords.Add( "or" );
! 			Keywords.Add( "not" );
! 			Keywords.Add( "like" );
! 			Keywords.Add( "is" );
! 			Keywords.Add( "in" );
! 			Keywords.Add( "between" );
! 			Keywords.Add( "null" );
! 			Keywords.Add( "select" );
! 			Keywords.Add( "from" );
! 			Keywords.Add( "where" );
! 			Keywords.Add( "having" );
! 			Keywords.Add( "group" );
! 			Keywords.Add( "order" );
! 			Keywords.Add( "by" );
  
  			delimiterList.Add(" ");
***************
*** 70,74 ****
  		public static void AddKeyword(string keyword) 
  		{
! 			Keywords[keyword] = String.Empty;
  		}
  
--- 71,75 ----
  		public static void AddKeyword(string keyword) 
  		{
! 			Keywords.Add( keyword );
  		}
  
***************
*** 125,129 ****
  					bool isIdentifier = token[0]=='`' || ( // allow any identifier quoted with backtick
  						Char.IsLetter(token[0]) && // only recognizes identifiers beginning with a letter
! 						!Keywords.ContainsKey( token.ToLower() ) &&
  						token.IndexOf('.') < 0
  						);
--- 126,130 ----
  					bool isIdentifier = token[0]=='`' || ( // allow any identifier quoted with backtick
  						Char.IsLetter(token[0]) && // only recognizes identifiers beginning with a letter
! 						!Keywords.Contains( token.ToLower() ) &&
  						token.IndexOf('.') < 0
  						);

Index: Parameter.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Parameter.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Parameter.cs	21 Sep 2004 09:58:25 -0000	1.10
--- Parameter.cs	4 Dec 2004 22:41:29 -0000	1.11
***************
*** 133,141 ****
  		public override int GetHashCode()
  		{
! 			int hashCode;
  
  			unchecked 
  			{
! 				hashCode = _sqlType.GetHashCode() + name.GetHashCode();
  				if(tableAlias!=null) 
  				{
--- 133,148 ----
  		public override int GetHashCode()
  		{
! 			int hashCode = 0;
  
  			unchecked 
  			{
! 				if( _sqlType!=null ) 
! 				{
! 					hashCode += _sqlType.GetHashCode();
! 				}
! 				if( name!=null ) 
! 				{
! 					hashCode += name.GetHashCode();
! 				}
  				if(tableAlias!=null) 
  				{

[Nhibernate-commit] nhibernate/src/NHibernate/Persister AbstractEntityPersister.cs,1.27,1.28 EntityPersister.cs,1.32,1.33 NormalizedEntityPersister.cs,1.35,1.36

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

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

Modified Files:
	AbstractEntityPersister.cs EntityPersister.cs 
	NormalizedEntityPersister.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** NormalizedEntityPersister.cs	30 Nov 2004 18:36:51 -0000	1.35
--- NormalizedEntityPersister.cs	4 Dec 2004 22:41:29 -0000	1.36
***************
*** 1,6 ****
  using System;
- using System.Text;
- using System.Data;
  using System.Collections;
  
  using NHibernate.Engine;
--- 1,8 ----
  using System;
  using System.Collections;
+ using System.Data;
+ using System.Text;
+ 
+ using Iesi.Collections;
  
  using NHibernate.Engine;
***************
*** 307,312 ****
  
  			// check distinctness of columns for this specific subclass only
! 			Hashtable distinctColumns = new Hashtable();
! 			CheckColumnDuplication(distinctColumns, model.Key.ColumnCollection);
  			foreach(Mapping.Property prop in model.PropertyCollection) 
  			{
--- 309,314 ----
  
  			// check distinctness of columns for this specific subclass only
! 			HashedSet distinctColumns = new HashedSet();
! 			CheckColumnDuplication( distinctColumns, model.Key.ColumnCollection );
  			foreach(Mapping.Property prop in model.PropertyCollection) 
  			{

Index: AbstractEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/AbstractEntityPersister.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AbstractEntityPersister.cs	21 Nov 2004 22:56:29 -0000	1.27
--- AbstractEntityPersister.cs	4 Dec 2004 22:41:22 -0000	1.28
***************
*** 3,6 ****
--- 3,8 ----
  using System.Reflection;
  
+ using Iesi.Collections;
+ 
  using NHibernate.Cache;
  using NHibernate.Cfg;
***************
*** 789,794 ****
  		}
  
! 		// IDictionary was a Set in h2.0.3
! 		protected void CheckColumnDuplication(IDictionary distinctColumns, ICollection columns) 
  		{
  			foreach(Column col in columns) 
--- 791,795 ----
  		}
  
! 		protected void CheckColumnDuplication(ISet distinctColumns, ICollection columns) 
  		{
  			foreach(Column col in columns) 

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** EntityPersister.cs	30 Nov 2004 18:36:51 -0000	1.32
--- EntityPersister.cs	4 Dec 2004 22:41:29 -0000	1.33
***************
*** 1,6 ****
  using System;
- using System.Text;
- using System.Data;
  using System.Collections;
  
  using NHibernate.Engine;
--- 1,8 ----
  using System;
  using System.Collections;
+ using System.Data;
+ using System.Text;
+ 
+ using Iesi.Collections;
  
  using NHibernate.Engine;
***************
*** 84,91 ****
  
  			// detect mapping errors
! 			// note: h2.0.3 uses a HashSet
! 			IDictionary distinctColumns = new Hashtable();
! 			object distinctColumnsObject = new object();
! 
  			// DISCRIMINATOR
  
--- 86,91 ----
  
  			// detect mapping errors
! 			HashedSet distinctColumns = new HashedSet();
! 			
  			// DISCRIMINATOR
  
***************
*** 122,126 ****
  					throw new MappingException("Could not format discriminator value to sql string", e);
  				}
! 				distinctColumns.Add(discriminatorColumnName, distinctColumnsObject);
  
  			} 
--- 122,127 ----
  					throw new MappingException("Could not format discriminator value to sql string", e);
  				}
! 				
! 				distinctColumns.Add( discriminatorColumnName );
  
  			} 

[Nhibernate-commit] nhibernate/src/NHibernate/Util ReflectHelper.cs,1.18,1.19

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

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

Modified Files:
	ReflectHelper.cs 
Log Message:
Modified more exceptions to not be "throw e" and instead just be "throw"
Moved internal fields from IList to ISet where applicable.
Fixed generation of sql from hql that was causing spacing problems with
MySql.

Index: ReflectHelper.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/ReflectHelper.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ReflectHelper.cs	22 Nov 2004 03:52:18 -0000	1.18
--- ReflectHelper.cs	4 Dec 2004 22:41:30 -0000	1.19
***************
*** 104,108 ****
  				}
  
! 				throw pnfe;
  			}
  		}
--- 104,108 ----
  				}
  
! 				throw;
  			}
  		}

[Nhibernate-commit] nhibernate/src/NHibernate/Util IdentityMap.cs,1.13,1.14

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

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

Modified Files:
	IdentityMap.cs 
Log Message:
removed an unused namespace from "using" section.

Index: IdentityMap.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/IdentityMap.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IdentityMap.cs	10 Sep 2004 21:23:16 -0000	1.13
--- IdentityMap.cs	4 Dec 2004 22:24:17 -0000	1.14
***************
*** 1,5 ****
  using System;
  using System.Collections;
- using System.Collections.Specialized;
  using System.Runtime.Serialization;
  
--- 1,4 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Type TypeFactory.cs,1.38,1.39

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

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

Modified Files:
	TypeFactory.cs 
Log Message:
removed an unused namespace from "using" section.

Index: TypeFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TypeFactory.cs,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** TypeFactory.cs	25 Aug 2004 03:52:21 -0000	1.38
--- TypeFactory.cs	4 Dec 2004 22:24:17 -0000	1.39
***************
*** 1,5 ****
  using System;
  using System.Collections;
- using System.Collections.Specialized;
  using System.Globalization;
  
--- 1,4 ----

[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand SqlInsertBuilder.cs,1.3,1.4 SqlSelectBuilder.cs,1.5,1.6

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

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

Modified Files:
	SqlInsertBuilder.cs SqlSelectBuilder.cs 
Log Message:
removed an unused namespace from "using" section.

Index: SqlSelectBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SqlSelectBuilder.cs	22 Nov 2004 03:56:08 -0000	1.5
--- SqlSelectBuilder.cs	4 Dec 2004 22:24:16 -0000	1.6
***************
*** 1,5 ****
  using System;
  using System.Collections;
- using System.Collections.Specialized;
  using System.Data;
  using System.Text;
--- 1,4 ----

Index: SqlInsertBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlInsertBuilder.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SqlInsertBuilder.cs	22 Nov 2004 03:56:08 -0000	1.3
--- SqlInsertBuilder.cs	4 Dec 2004 22:24:16 -0000	1.4
***************
*** 1,5 ****
  using System;
  using System.Collections;
- using System.Collections.Specialized;
  using System.Data;
  using System.Text;
--- 1,4 ----

[Nhibernate-commit] nhibernate/src/NHibernate HibernateException.cs,1.6,1.7

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

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

Modified Files:
	HibernateException.cs 
Log Message:
If no message is provided then the wrapped exceptions message
is used.

Index: HibernateException.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/HibernateException.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HibernateException.cs	22 Nov 2004 03:50:03 -0000	1.6
--- HibernateException.cs	2 Dec 2004 21:26:01 -0000	1.7
***************
*** 12,24 ****
  	public class HibernateException : ApplicationException 
  	{
! 		public HibernateException() : base (String.Empty) { }
  
! 		public HibernateException(Exception e) : base(String.Empty, e) { }
  
! 		public HibernateException(string message, Exception e) : base(message, e) { }
  
! 		public HibernateException(string message) : base(message) { }
  
! 		protected HibernateException(SerializationInfo info, StreamingContext context) : base(info, context) { }
  	}
  }
--- 12,34 ----
  	public class HibernateException : ApplicationException 
  	{
! 		public HibernateException() : base( String.Empty ) 
! 		{ 
! 		}
  
! 		public HibernateException(Exception e) : base( e.Message, e ) 
! 		{ 
! 		}
  
! 		public HibernateException(string message, Exception e) : base( message, e )
! 		{ 
! 		}
  
! 		public HibernateException(string message) : base( message ) 
! 		{ 
! 		}
  
! 		protected HibernateException(SerializationInfo info, StreamingContext context) : base(info, context) 
! 		{ 
! 		}
  	}
  }

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.18,1.19 readme.html,1.12,1.13

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

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30406

Modified Files:
	NHibernateSolution.build readme.html 
Log Message:
minor correction to build file
addition of collections library in readme

Index: readme.html
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/readme.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** readme.html	12 Oct 2004 22:57:36 -0000	1.12
--- readme.html	2 Dec 2004 20:50:41 -0000	1.13
***************
*** 10,26 ****
  		<h2>Latest Version</h2>
  		<p>
! 			Details of the latest version of NHibernate can be found on SourceForge at <a href="http://sourceforge.net/projects/nhibernate">
! 				http://sourceforge.net/projects/nhibernate</a>.
  		</p>
  		<h2>Documentation</h2>
  		<p>
  			Documentation is very thin right now. We are working on documenting the code as 
! 			it is being developed. The API documentation is in MSDN format thanks to <a href="http://sourceforge.net/projects/ndoc">
! 				NDoc</a>.
  		</p>
  		<p>
  			We will ride the coat tails of Hibernate's excellent documentation for a while. 
! 			The Hibernate documentation for the version we are porting can be found at <a href="http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/">
! 				http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/ </a>. The 
  			first few docs will be describing the subtle differences between NHibernate and 
  			Hibernate - including the features found in Hibernate that have not been 
--- 10,28 ----
  		<h2>Latest Version</h2>
  		<p>
! 			Details of the latest version of NHibernate can be found on SourceForge at 
! 			<a href="http://sourceforge.net/projects/nhibernate">
! 			http://sourceforge.net/projects/nhibernate</a>.
  		</p>
  		<h2>Documentation</h2>
  		<p>
  			Documentation is very thin right now. We are working on documenting the code as 
! 			it is being developed. The API documentation is in MSDN format thanks to 
! 			<a href="http://sourceforge.net/projects/ndoc">NDoc</a>.
  		</p>
  		<p>
  			We will ride the coat tails of Hibernate's excellent documentation for a while. 
! 			The Hibernate documentation for the version we are porting can be found at 
! 			<a href="http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/">
! 			http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/ </a>. The 
  			first few docs will be describing the subtle differences between NHibernate and 
  			Hibernate - including the features found in Hibernate that have not been 
***************
*** 43,57 ****
  		</p>
  		<ul>
! 			<li>
! 				log4net</li>
  		</ul>
  		<p>
! 			This product includes source code derived from a sample written by Mattias 
! 			Sjogren.
  		</p>
  		<ul>
  			<li>
  				HashCodeProvider - original code can be found at <a href="http://www.msjogren.net/dotnet/eng/samples/misc.asp">
! 					http://www.msjogren.net/dotnet/eng/samples/misc.asp</a></li>
  		</ul>
  	</body>
--- 45,67 ----
  		</p>
  		<ul>
! 			<li>log4net</li>
  		</ul>
  		<p>
! 			This product includes source code derived from a sample written by Mattias Sjogren.
  		</p>
  		<ul>
  			<li>
  				HashCodeProvider - original code can be found at <a href="http://www.msjogren.net/dotnet/eng/samples/misc.asp">
! 					http://www.msjogren.net/dotnet/eng/samples/misc.asp</a>
! 			</li>
! 		</ul>
! 		<p>
! 			This product includes source code from an article written by Jason Smith.
! 		</p>
! 		<ul>
! 			<li>
! 				Iesi.Collections - original code can be found at <a href="http://www.codeproject.com/csharp/sets.asp">
! 					Add Support for "Set" Collections to .NET</a>
! 			</li>
  		</ul>
  	</body>

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NHibernateSolution.build	2 Dec 2004 19:32:38 -0000	1.18
--- NHibernateSolution.build	2 Dec 2004 20:50:41 -0000	1.19
***************
*** 248,253 ****
  		
  	</target>
! 	<!--depends="test sdkdoc" -->
! 	<target name="package" description="Creates Zip files for the File Release System on SourceForge">
  		<copy todir="${build.dir}">
  			<fileset>
--- 248,253 ----
  		
  	</target>
! 	
! 	<target name="package" depends="test sdkdoc" description="Creates Zip files for the File Release System on SourceForge">
  		<copy todir="${build.dir}">
  			<fileset>

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel AssemblyInfo.cs,1.9,1.10

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
modifications to generated files build 0.5

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/AssemblyInfo.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssemblyInfo.cs	3 Nov 2004 02:03:15 -0000	1.9
--- AssemblyInfo.cs	2 Dec 2004 20:49:50 -0000	1.10
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.5.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.5")]
! [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Tasks AssemblyInfo.cs,1.4,1.5

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
modifications to generated files build 0.5

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Tasks/AssemblyInfo.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AssemblyInfo.cs	3 Nov 2004 02:03:21 -0000	1.4
--- AssemblyInfo.cs	2 Dec 2004 20:49:50 -0000	1.5
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Tasks")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Tasks")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.5.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.5")]
! [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Tool.hbm2net AssemblyInfo.cs,1.5,1.6

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

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Tool.hbm2net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30178/src/NHibernate.Tool.hbm2net

Modified Files:
	AssemblyInfo.cs 
Log Message:
modifications to generated files build 0.5

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Tool.hbm2net/AssemblyInfo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssemblyInfo.cs	3 Nov 2004 02:03:21 -0000	1.5
--- AssemblyInfo.cs	2 Dec 2004 20:49:51 -0000	1.6
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Tool.hbm2net")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Tool.hbm2net")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.5.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.5")]
! [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test AssemblyInfo.cs,1.9,1.10

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
modifications to generated files build 0.5

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/AssemblyInfo.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssemblyInfo.cs	3 Nov 2004 02:03:21 -0000	1.9
--- AssemblyInfo.cs	2 Dec 2004 20:49:51 -0000	1.10
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Test")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Test")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.5.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.5")]
! [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate AssemblyInfo.cs,1.12,1.13

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
modifications to generated files build 0.5

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssemblyInfo.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AssemblyInfo.cs	21 Nov 2004 22:56:24 -0000	1.12
--- AssemblyInfo.cs	2 Dec 2004 20:49:50 -0000	1.13
***************
*** 19,25 ****
  [assembly: AssemblyProductAttribute("NHibernate")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.4.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.4")]
! [assembly: AssemblyFileVersionAttribute("0.4.0.0")]
  //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  
--- 19,25 ----
  [assembly: AssemblyProductAttribute("NHibernate")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.5.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.5")]
! [assembly: AssemblyFileVersionAttribute("0.5.0.0")]
  //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.17,1.18 releasenotes.txt,1.20,1.21

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

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10415

Modified Files:
	NHibernateSolution.build releasenotes.txt 
Log Message:
preparing for build 0.5

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** NHibernateSolution.build	27 Nov 2004 18:58:41 -0000	1.17
--- NHibernateSolution.build	2 Dec 2004 19:32:38 -0000	1.18
***************
*** 31,35 ****
  	<property name="project.name" value="nhibernate" />
  	<property name="project.version.major" value="0" />
! 	<property name="project.version.minor" value="4" />
  	<property name="project.version.build" value="0" />
  	<property name="project.version.revision" value="0" />
--- 31,35 ----
  	<property name="project.name" value="nhibernate" />
  	<property name="project.version.major" value="0" />
! 	<property name="project.version.minor" value="5" />
  	<property name="project.version.build" value="0" />
  	<property name="project.version.revision" value="0" />
***************
*** 248,253 ****
  		
  	</target>
! 
! 	<target name="package" depends="test sdkdoc" description="Creates Zip files for the File Release System on SourceForge">
  		<copy todir="${build.dir}">
  			<fileset>
--- 248,253 ----
  		
  	</target>
! 	<!--depends="test sdkdoc" -->
! 	<target name="package" description="Creates Zip files for the File Release System on SourceForge">
  		<copy todir="${build.dir}">
  			<fileset>
***************
*** 286,289 ****
--- 286,290 ----
  			<fileset basedir="${build.dir}">
  				<includes name="**/*" />
+ 				<excludes name="bin/log.txt" />
  			</fileset>
  		</zip>

Index: releasenotes.txt
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/releasenotes.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** releasenotes.txt	27 Nov 2004 03:45:42 -0000	1.20
--- releasenotes.txt	2 Dec 2004 19:32:38 -0000	1.21
***************
*** 8,14 ****
  - Updated to latest MySql Data Provider and changed classes to MySqlDataDriver.  Removed binaries from CVS since they are GPL now.
  - Isolated test and classes that use DbType.Time into their own fixtures.  Data Drivers don't implement this consistently.
! - Fixed problem where HQL was not parsing Fully Qualified Enums correctly. (Peter Smulovics)
  - Fixed Int16 not working as a <version> Property.
! - Modified NHibernate and Iesi.Collections to have the attribute CLSCompliantAttribute(true).
  
  Alpha Build 0.4.0.0
--- 8,19 ----
  - Updated to latest MySql Data Provider and changed classes to MySqlDataDriver.  Removed binaries from CVS since they are GPL now.
  - Isolated test and classes that use DbType.Time into their own fixtures.  Data Drivers don't implement this consistently.
! - Fixed problem where HQL was not parsing Enums correctly. (Peter Smulovics)
  - Fixed Int16 not working as a <version> Property.
! - Added CLSCompliantAttribute(true) attribute to NHibernate and Iesi.Collections.
! - Fixed how Exceptions are rethrown to not lose the stack trace.
! - Added more comments around ISession.Find and ISession.Enumerate to explain Cache usage.
! - Fixed bug with dynamic-update generating SQL for all properties. (Sergey Koshcheyev)
! - Add Clover.NET into NHibernate build process thanks to license donated by Cenqua (www.cenqua.com).
! - Modified TableGenerator to default first id to "1" instead of "0" to work better with unsaved-value. (Karl Andersson)
  
  Alpha Build 0.4.0.0

[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionImpl.cs,1.52,1.53

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

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

Modified Files:
	SessionImpl.cs 
Log Message:
Modified how exceptions are rethrown - NH-153 and this blog
http://dotnetguy.techieswithcats.com/archives/004118.shtml 
inspired effort.

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** SessionImpl.cs	29 Nov 2004 18:43:22 -0000	1.52
--- SessionImpl.cs	30 Nov 2004 18:36:50 -0000	1.53
***************
*** 1478,1482 ****
  				//mainly a CallbackException
  				RollbackDeletion(entry, delete);
! 				SessionImpl.Handle(e); //rethrow exception
  			}
  		}
--- 1478,1491 ----
  				//mainly a CallbackException
  				RollbackDeletion(entry, delete);
! 				if (e is HibernateException) 
! 				{
! 					throw;
! 				} 
! 				else 
! 				{
! 					log.Error("unexpected exception", e);
! 					throw new HibernateException("unexpected exception", e);
! 				}
! 				
  			}
  		}
***************
*** 3837,3854 ****
  		#endregion
  
- 
- 		public static void Handle(Exception e) 
- 		{
- 			if (e is HibernateException) 
- 			{
- 				throw (HibernateException) e;
- 			} 
- 			else 
- 			{
- 				log.Error("unexpected exception", e);
- 				throw new HibernateException("unexpected exception", e);
- 			}
- 		}
- 
  		public ICollection Filter(object collection, string filter) 
  		{
--- 3846,3849 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Loader Loader.cs,1.41,1.42

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

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

Modified Files:
	Loader.cs 
Log Message:
Modified how exceptions are rethrown - NH-153 and this blog
http://dotnetguy.techieswithcats.com/archives/004118.shtml 
inspired effort.

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Loader.cs	22 Nov 2004 03:53:07 -0000	1.41
--- Loader.cs	30 Nov 2004 18:36:51 -0000	1.42
***************
*** 238,244 ****
  				}
  			}
  			catch (Exception e) 
  			{
! 				throw e;
  			} 
  			finally 
--- 238,246 ----
  				}
  			}
+ 			// TODO: change to SqlException
  			catch (Exception e) 
  			{
! 				// TODO: log the SqlException
! 				throw;
  			} 
  			finally 

[Nhibernate-commit] nhibernate/src/NHibernate/Persister EntityPersister.cs,1.31,1.32 NormalizedEntityPersister.cs,1.34,1.35

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

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

Modified Files:
	EntityPersister.cs NormalizedEntityPersister.cs 
Log Message:
Modified how exceptions are rethrown - NH-153 and this blog
http://dotnetguy.techieswithcats.com/archives/004118.shtml 
inspired effort.

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** NormalizedEntityPersister.cs	21 Nov 2004 22:56:29 -0000	1.34
--- NormalizedEntityPersister.cs	30 Nov 2004 18:36:51 -0000	1.35
***************
*** 965,969 ****
  				catch (Exception e) 
  				{
! 					throw e;
  				} 
  				finally 
--- 965,970 ----
  				catch (Exception e) 
  				{
! 					// TODO: log exception
! 					throw;
  				} 
  				finally 
***************
*** 1050,1057 ****
  
  			} 
! 				//TODO: change this to SQLException catching and log it
  			catch( Exception e ) 
  			{
! 				throw e;
  			} 
  			finally 
--- 1051,1058 ----
  
  			} 
! 			//TODO: change this to SQLException catching and log it
  			catch( Exception e ) 
  			{
! 				throw;
  			} 
  			finally 
***************
*** 1130,1137 ****
  
  			} 
! 				//TODO: change this to SQLException and log it
  			catch (Exception e) 
  			{
! 				throw e;
  			} 
  			finally 
--- 1131,1138 ----
  
  			} 
! 			//TODO: change this to SQLException and log it
  			catch (Exception e) 
  			{
! 				throw;
  			} 
  			finally 
***************
*** 1152,1159 ****
  					session.Batcher.ExecuteNonQuery( statement );
  				} 
! 					//TODO: change this to SQLException and log it
  				catch ( Exception e) 
  				{
! 					throw e;
  				} 
  				finally 
--- 1153,1160 ----
  					session.Batcher.ExecuteNonQuery( statement );
  				} 
! 				//TODO: change this to SQLException and log it
  				catch ( Exception e) 
  				{
! 					throw;
  				} 
  				finally 
***************
*** 1201,1207 ****
  				}
  			} 
  			catch (Exception e) 
  			{
! 				throw e;
  			} 
  			finally 
--- 1202,1210 ----
  				}
  			} 
+ 			//TODO: change to SqlException
  			catch (Exception e) 
  			{
! 				// TODO: log info
! 				throw;
  			} 
  			finally 
***************
*** 1305,1310 ****
  			} 
  			// TODO: change to SQLException and log
! 			catch (Exception e) {
! 				throw e;
  			} 
  			finally 
--- 1308,1314 ----
  			} 
  			// TODO: change to SQLException and log
! 			catch (Exception e) 
! 			{
! 				throw;
  			} 
  			finally 

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** EntityPersister.cs	21 Nov 2004 22:56:29 -0000	1.31
--- EntityPersister.cs	30 Nov 2004 18:36:51 -0000	1.32
***************
*** 804,811 ****
  
  			}
! 				//TODO: add SQLException catching here...
  			catch (Exception e ) 
  			{
! 				throw e;
  			}
  		}
--- 804,812 ----
  
  			}
! 			//TODO: add SQLException catching here...
  			catch (Exception e ) 
  			{
! 				session.Batcher.AbortBatch( e );
! 				throw;
  			}
  		}
***************
*** 877,884 ****
  				return id;
  			} 
! 				//TODO: add SQLException logging here
  			catch (Exception e) 
  			{
! 				throw e;
  			} 
  			finally 
--- 878,886 ----
  				return id;
  			} 
! 			//TODO: add SQLException logging here
  			catch (Exception e) 
  			{
! 				// TODO: log it
! 				throw;
  			} 
  			finally 
***************
*** 936,943 ****
  				}
  			}
! 				// TODO: h2.0.3 - add some Sql Exception logging here
  			catch (Exception e) 
  			{
! 				throw e;
  			}
  			finally 
--- 938,953 ----
  				}
  			}
! 			// TODO: h2.0.3 - add some Sql Exception logging here
  			catch (Exception e) 
  			{
! 				if( IsVersioned ) 
! 				{
! 					//TODO: add some logging.
! 				}
! 				else 
! 				{
! 					session.Batcher.AbortBatch( e );
! 				}
! 				throw;
  			}
  			finally 
***************
*** 1045,1049 ****
  				}
  
! 				throw e;
  			} 
  			finally 
--- 1055,1059 ----
  				}
  
! 				throw;
  			} 
  			finally 

[Nhibernate-commit] nhibernate/src/NHibernate/Id SequenceGenerator.cs,1.5,1.6 TableGenerator.cs,1.10,1.11

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

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

Modified Files:
	SequenceGenerator.cs TableGenerator.cs 
Log Message:
Modified how exceptions are rethrown - NH-153 and this blog
http://dotnetguy.techieswithcats.com/archives/004118.shtml 
inspired effort.

Index: TableGenerator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/TableGenerator.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TableGenerator.cs	27 Nov 2004 01:00:09 -0000	1.10
--- TableGenerator.cs	30 Nov 2004 18:36:50 -0000	1.11
***************
*** 115,122 ****
  						rs.Close();
  					} 
  					catch (Exception e) 
  					{
  						log.Error("could not read a hi value", e);
! 						throw e;
  					} 
  					finally 
--- 115,123 ----
  						rs.Close();
  					} 
+ 					// TODO: change to SqlException
  					catch (Exception e) 
  					{
  						log.Error("could not read a hi value", e);
! 						throw;
  					} 
  					finally 
***************
*** 135,142 ****
  						rows = ups.ExecuteNonQuery();
  					} 
  					catch (Exception e) 
  					{
  						log.Error("could not update hi value in: " + tableName, e);
! 						throw e;
  					} 
  					finally 
--- 136,144 ----
  						rows = ups.ExecuteNonQuery();
  					} 
+ 					// TODO: change to SqlException
  					catch (Exception e) 
  					{
  						log.Error("could not update hi value in: " + tableName, e);
! 						throw;
  					} 
  					finally 

Index: SequenceGenerator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/SequenceGenerator.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SequenceGenerator.cs	14 Sep 2004 17:49:54 -0000	1.5
--- SequenceGenerator.cs	30 Nov 2004 18:36:50 -0000	1.6
***************
*** 54,60 ****
  				return result;
  			} 
  			catch (Exception e) 
  			{
! 				throw e;
  			} 
  			finally 
--- 54,62 ----
  				return result;
  			} 
+ 			// TODO: change to SQLException
  			catch (Exception e) 
  			{
! 				// TODO: add code to log the sql exception
! 				throw;
  			} 
  			finally 

[Nhibernate-commit] nhibernate/src/NHibernate/Collection CollectionPersister.cs,1.28,1.29

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

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

Modified Files:
	CollectionPersister.cs 
Log Message:
Modified how exceptions are rethrown - NH-153 and this blog
http://dotnetguy.techieswithcats.com/archives/004118.shtml 
inspired effort.

Index: CollectionPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/CollectionPersister.cs,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** CollectionPersister.cs	28 Aug 2004 15:31:46 -0000	1.28
--- CollectionPersister.cs	30 Nov 2004 18:36:49 -0000	1.29
***************
*** 686,692 ****
  					session.Batcher.AddToBatch(-1);
  				} 
  				catch (Exception e) 
  				{
! 					throw e;
  				}
  				if (log.IsDebugEnabled ) log.Debug("done deleting collection");
--- 686,694 ----
  					session.Batcher.AddToBatch(-1);
  				} 
+ 				// TODO: change to SqlException
  				catch (Exception e) 
  				{
! 					session.Batcher.AbortBatch( e );
! 					throw;
  				}
  				if (log.IsDebugEnabled ) log.Debug("done deleting collection");
***************
*** 722,728 ****
  						}
  					} 
  					catch (Exception e) 
  					{
! 						throw e;
  					}
  					if( log.IsDebugEnabled) log.Debug("done inserting collection");
--- 724,732 ----
  						}
  					} 
+ 					//TODO: change to SqlException
  					catch (Exception e) 
  					{
! 						session.Batcher.AbortBatch( e );
! 						throw;
  					}
  					if( log.IsDebugEnabled) log.Debug("done inserting collection");
***************
*** 754,760 ****
  						}
  					} 
  					catch (Exception e) 
  					{
! 						throw e;
  					}
  					
--- 758,766 ----
  						}
  					} 
+ 					// TODO: change to SqlException
  					catch (Exception e) 
  					{
! 						session.Batcher.AbortBatch( e );
! 						throw;
  					}
  					
***************
*** 790,796 ****
  				}
  			} 
  			catch (Exception e) 
  			{
! 				throw e;
  			}
  		}
--- 796,804 ----
  				}
  			} 
+ 			// TODO: change to SqlException
  			catch (Exception e) 
  			{
! 				session.Batcher.AbortBatch( e );
! 				throw;
  			}
  		}
***************
*** 818,825 ****
  				}
  			} 
  			catch(Exception e) 
  			{
  				session.Batcher.AbortBatch( e );
! 				throw e;
  			}
  
--- 826,834 ----
  				}
  			} 
+ 			// TODO: change to SqlException
  			catch(Exception e) 
  			{
  				session.Batcher.AbortBatch( e );
! 				throw;
  			}
  
***************
*** 846,852 ****
  				}
  			} 
  			catch (Exception e) 
  			{
! 				throw e;
  			}
  		}
--- 855,863 ----
  				}
  			} 
+ 			//TODO: change to SqlException
  			catch (Exception e) 
  			{
! 				session.Batcher.AbortBatch( e );
! 				throw;
  			}
  		}
***************
*** 898,905 ****
  						i++;
  					}
! 				} 
  				catch (Exception e) 
  				{
! 					throw e;
  				}
  
--- 909,918 ----
  						i++;
  					}
! 				}
! 				//TODO: change to SqlException
  				catch (Exception e) 
  				{
! 					session.Batcher.AbortBatch( e );
! 					throw;
  				}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Impl EnumerableImpl.cs,1.6,1.7 SessionImpl.cs,1.51,1.52

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

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

Modified Files:
	EnumerableImpl.cs SessionImpl.cs 
Log Message:
Added more comments around Enumerable implementation.

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** SessionImpl.cs	29 Nov 2004 15:31:07 -0000	1.51
--- SessionImpl.cs	29 Nov 2004 18:43:22 -0000	1.52
***************
*** 2253,2261 ****
  		/// later. This should return an existing proxy where appropriate.
  		/// </summary>
! 		/// <param name="clazz"></param>
! 		/// <param name="id"></param>
! 		/// <param name="checkDeleted"></param>
! 		/// <param name="allowProxyCreation"></param>
! 		/// <returns></returns>
  		private object DoLoadByClass(System.Type clazz, object id, bool checkDeleted, bool allowProxyCreation) 
  		{
--- 2253,2271 ----
  		/// later. This should return an existing proxy where appropriate.
  		/// </summary>
! 		/// <param name="clazz">The <see cref="System.Type"/> of the object to load.</param>
! 		/// <param name="id">The identifier of the object in the database.</param>
! 		/// <param name="checkDeleted">
! 		/// A boolean indicating if NHiberate should check if the object has or has not been deleted.
! 		/// </param>
! 		/// <param name="allowProxyCreation">A boolean indicating if it is allowed to return a Proxy instead of an instance of the <see cref="System.Type"/>.</param>
! 		/// <returns>
! 		/// An loaded instance of the object or a proxy of the object is proxies are allowed.
! 		/// </returns>
! 		/// <remarks>
! 		/// If the parameter <c>checkDeleted</c> is <c>false</c> it is possible to return an object that has 
! 		/// been deleted by the user in this <see cref="ISession"/>.  If the parameter <c>checkDeleted</c> is
! 		/// <c>true</c> and the object has been deleted then an <see cref="ObjectDeletedException"/> will be
! 		/// thrown.
! 		/// </remarks>
  		private object DoLoadByClass(System.Type clazz, object id, bool checkDeleted, bool allowProxyCreation) 
  		{

Index: EnumerableImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/EnumerableImpl.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EnumerableImpl.cs	14 Sep 2004 17:49:55 -0000	1.6
--- EnumerableImpl.cs	29 Nov 2004 18:43:21 -0000	1.7
***************
*** 9,13 ****
  {
  	/// <summary>
! 	/// Implements enumerable
  	/// </summary>
  	/// <remarks>
--- 9,13 ----
  {
  	/// <summary>
! 	/// Provides an <see cref="IEnumerable"/> wrapper over the results of an <see cref="IQuery"/>.
  	/// </summary>
  	/// <remarks>
***************
*** 76,81 ****
--- 76,88 ----
  				log.Debug("retreiving next results");
  				_currentResults = new object[_types.Length];
+ 				
+ 				// move through each of the ITypes contained in the IDataReader and convert them
+ 				// to their objects.  
  				for (int i=0; i<_types.Length; i++) 
  				{
+ 					// The IType knows how to extract its value out of the IDataReader.  If the IType
+ 					// is a value type then the value will simply be pulled out of the IDataReader.  If
+ 					// the IType is an Entity type then the IType will extract the id from the IDataReader
+ 					// and use the ISession to load an instance of the object.
  					_currentResults[i] = _types[i].NullSafeGet(_reader, _names[i], _sess, null);
  				}
***************
*** 83,87 ****
  		}
  
! 		
  		public IEnumerator GetEnumerator() 
  		{
--- 90,99 ----
  		}
  
! 		/// <summary>
! 		/// Returns an enumerator that can iterate through the query results.
! 		/// </summary>
! 		/// <returns>
! 		/// An <see cref="IEnumerator" /> that can be used to iterate through the query results.
! 		/// </returns>
  		public IEnumerator GetEnumerator() 
  		{
***************
*** 90,93 ****
--- 102,117 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets the current element in the query results.
+ 		/// </summary>
+ 		/// <value>
+ 		/// The current element in the query results which is either an object or 
+ 		/// an object array.
+ 		/// </value>
+ 		/// <remarks>
+ 		/// If the <see cref="IQuery"/> only returns one type of Entity then an object will
+ 		/// be returned.  If this is a multi-column resultset then an object array will be
+ 		/// returned.
+ 		/// </remarks>
  		public object Current 
  		{
***************
*** 105,108 ****
--- 129,139 ----
  		}
  
+ 		/// <summary>
+ 		/// Advances the enumerator to the next element of the query results.
+ 		/// </summary>
+ 		/// <returns>
+ 		/// <c>true</c> if the enumerator was successfully advanced to the next query results
+ 		/// ; <c>false</c> if the enumerator has passed the end of the query results.
+ 		///</returns>
  		public bool MoveNext() 
  		{

[Nhibernate-commit] nhibernate/src/NHibernate/Type EntityType.cs,1.5,1.6 ManyToOneType.cs,1.7,1.8

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

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

Modified Files:
	EntityType.cs ManyToOneType.cs 
Log Message:
Added more comments around Enumerable implementation.

Index: EntityType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/EntityType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EntityType.cs	20 Sep 2004 02:27:01 -0000	1.5
--- EntityType.cs	29 Nov 2004 18:43:23 -0000	1.6
***************
*** 105,109 ****
  		}
  	
! 		public override sealed object NullSafeGet(IDataReader rs, string[] names, ISessionImplementor session, object owner) {
  			return ResolveIdentifier( Hydrate(rs, names, session, owner), session, owner );
  		}
--- 105,120 ----
  		}
  	
! 		/// <summary>
! 		/// Converts the id contained in the <see cref="IDataReader"/> to an object.
! 		/// </summary>
! 		/// <param name="rs">The <see cref="IDataReader"/> that contains the query results.</param>
! 		/// <param name="names">A string array of column names that contain the id.</param>
! 		/// <param name="session">The <see cref="ISessionImplementor"/> this is occurring in.</param>
! 		/// <param name="owner">The object that this Entity will be a part of.</param>
! 		/// <returns>
! 		/// An instance of the object or <c>null</c> if the identifer was null.
! 		/// </returns>
! 		public override sealed object NullSafeGet(IDataReader rs, string[] names, ISessionImplementor session, object owner) 
! 		{
  			return ResolveIdentifier( Hydrate(rs, names, session, owner), session, owner );
  		}

Index: ManyToOneType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/ManyToOneType.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ManyToOneType.cs	20 Aug 2004 17:39:01 -0000	1.7
--- ManyToOneType.cs	29 Nov 2004 18:43:24 -0000	1.8
***************
*** 37,49 ****
  		}
  
! 		public override object Hydrate(IDataReader rs, string[] names, ISessionImplementor session, object owner) {
  			return session.Factory.GetIdentifierType( PersistentClass )
  			.NullSafeGet(rs, names, session, owner);
  		}
  
  		public override object ResolveIdentifier(object value, ISessionImplementor session, object owner) {
! 			if (value==null) {
  				return null;
! 			} else {
  				return session.InternalLoad( PersistentClass, value );
  			}
--- 37,73 ----
  		}
  
! 		/// <summary>
! 		/// Hydrates the Identifier from <see cref="IDataReader"/>.
! 		/// </summary>
! 		/// <param name="rs">The <see cref="IDataReader"/> that contains the query results.</param>
! 		/// <param name="names">A string array of column names to read from.</param>
! 		/// <param name="session">The <see cref="ISessionImplementor"/> this is occuring in.</param>
! 		/// <param name="owner">The object that this Entity will be a part of.</param>
! 		/// <returns>
! 		/// An instantiated object that used as the identifier of the type.
! 		/// </returns>
! 		public override object Hydrate(IDataReader rs, string[] names, ISessionImplementor session, object owner) 
! 		{
  			return session.Factory.GetIdentifierType( PersistentClass )
  			.NullSafeGet(rs, names, session, owner);
  		}
  
+ 		/// <summary>
+ 		/// Resolves the Identifier to the actual object.
+ 		/// </summary>
+ 		/// <param name="value">The identifier object.</param>
+ 		/// <param name="session">The <see cref="ISessionImplementor"/> this is occurring in.</param>
+ 		/// <param name="owner"></param>
+ 		/// <returns>
+ 		/// The object that is identified by the parameter <c>value</c> or <c>null</c> if the parameter
+ 		/// <c>value</c> is also <c>null</c>. 
+ 		/// </returns>
  		public override object ResolveIdentifier(object value, ISessionImplementor session, object owner) {
! 			if (value==null) 
! 			{
  				return null;
! 			} 
! 			else 
! 			{
  				return session.InternalLoad( PersistentClass, value );
  			}