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

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

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

Modified Files:
	CriteriaLoader.cs 
Log Message:
Fixed problem with order by being generated with multi-columns.

Index: CriteriaLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CriteriaLoader.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CriteriaLoader.cs	19 May 2004 04:01:06 -0000	1.6
--- CriteriaLoader.cs	29 Jun 2004 04:27:21 -0000	1.7
***************
*** 34,40 ****
  			StringBuilder orderByBuilder = new StringBuilder(60);
  
- 			// TODO: H2.0.3 has code here to iterateExpressions() - our code is in the Expression.ToSqlString()
- 			// code I believe - verify this.
- 			bool orderByNeeded = true;
  			bool commaNeeded = false;
  			iter = criteria.IterateOrderings(); 
--- 34,37 ----
***************
*** 42,55 ****
  			while ( iter.MoveNext() ) 
  			{ 
- 				//TODO: H2.0.3 - this is not in H2.0.3 - where did it move to?
- 				//if(orderByNeeded) orderByBuilder.Append(" ORDER BY ");
- 				orderByNeeded = false;
- 
  				Order ord = (Order) iter.Current; 
- 				orderByBuilder.Append(ord.ToStringForSql(factory, criteria.PersistentClass, alias));
  				
  				if(commaNeeded) orderByBuilder.Append(StringHelper.CommaSpace); 
  				commaNeeded = true;
! 
  			} 
  
--- 39,48 ----
  			while ( iter.MoveNext() ) 
  			{ 
  				Order ord = (Order) iter.Current; 
  				
  				if(commaNeeded) orderByBuilder.Append(StringHelper.CommaSpace); 
  				commaNeeded = true;
! 				
! 				orderByBuilder.Append(ord.ToStringForSql(factory, criteria.PersistentClass, alias));
  			}