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

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

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

Modified Files:
	CriteriaLoader.cs 
Log Message:
Fixed up the QBE portion of NHibernate.Expression.

Index: CriteriaLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CriteriaLoader.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CriteriaLoader.cs	14 Mar 2005 18:53:03 -0000	1.12
--- CriteriaLoader.cs	17 Apr 2005 17:16:06 -0000	1.13
***************
*** 62,66 ****
  			IList associations = WalkTree( persister, Alias, factory );
  			InitClassPersisters( associations );
! 			InitStatementString( associations, criteria.Expression.ToSqlString( factory, criteria.PersistentClass, Alias ), orderByBuilder.ToString(), factory );
  
  			PostInstantiate();
--- 62,67 ----
  			IList associations = WalkTree( persister, Alias, factory );
  			InitClassPersisters( associations );
! 			// TODO: H2.1 SYNCH - new Hashtable() is a HACK until it is all up to H2.1 code
! 			InitStatementString( associations, criteria.Expression.ToSqlString( factory, criteria.PersistentClass, Alias, new Hashtable() ), orderByBuilder.ToString(), factory );
  
  			PostInstantiate();
***************
*** 80,85 ****
  			while( iter.MoveNext() )
  			{
! 				Expression.Expression expr = ( Expression.Expression ) iter.Current;
! 				TypedValue[ ] tv = expr.GetTypedValues( session.Factory, criteria.PersistentClass );
  				for( int i = 0; i < tv.Length; i++ )
  				{
--- 81,87 ----
  			while( iter.MoveNext() )
  			{
! 				Expression.ICriterion expr = ( Expression.ICriterion ) iter.Current;
! 				// TODO: h2.1 SYNCH - the new Hashtable() is a HACK
! 				TypedValue[ ] tv = expr.GetTypedValues(  session.Factory, criteria.PersistentClass,  new Hashtable() );
  				for( int i = 0; i < tv.Length; i++ )
  				{