[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 );
  
  			}