[Nhibernate-commit] nhibernate/src/NHibernate/Loader AbstractEntityLoader.cs,1.7,1.8 CollectionLoader.cs,1.7,1.8 Loader.cs,1.25,1.26 OneToManyLoader.cs,1.7,1.8 OuterJoinLoader.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-serv510/Loader

Modified Files:
	AbstractEntityLoader.cs CollectionLoader.cs Loader.cs 
	OneToManyLoader.cs OuterJoinLoader.cs 
Log Message:
Began refactoring to SqlString.

Index: CollectionLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CollectionLoader.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CollectionLoader.cs	25 Jun 2004 20:33:02 -0000	1.7
--- CollectionLoader.cs	16 Aug 2004 05:26:39 -0000	1.8
***************
*** 56,78 ****
  
  			this.sqlString = selectBuilder.ToSqlString();
- 			
- //			Select select = new Select()
- //				.SetSelectClause(
- //					persister.SelectClauseFragment(alias) +
- //					(joins==0 ? String.Empty : ", " + SelectString(associations) )
- //					)
- //				.SetFromClause ( persister.QualifiedTableName, alias )
- //				.SetWhereClause(
- //					new ConditionalFragment().SetTableAlias(alias)
- //					.SetCondition( persister.KeyColumnNames, StringHelper.SqlParameter )
- //					.ToFragmentString() +
- //					whereString
- //				)
- //				.SetOuterJoins(
- //					ojf.ToFromFragmentString,
- //					ojf.ToWhereFragmentString
- //				);
- //			if (persister.HasOrdering) select.SetOrderByClause( persister.GetSQLOrderByString(alias));
- //			sql = select.ToStatementString();
  
  			classPersisters = new ILoadable[joins];
--- 56,59 ----

Index: AbstractEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractEntityLoader.cs	25 Jun 2004 20:33:02 -0000	1.7
--- AbstractEntityLoader.cs	16 Aug 2004 05:26:39 -0000	1.8
***************
*** 5,9 ****
  using NHibernate.Engine;
  using NHibernate.Persister;
- using NHibernate.Sql;
  using NHibernate.SqlCommand;
  using NHibernate.Util;
--- 5,8 ----
***************
*** 42,55 ****
  				SelectString(persister, alias, suffixes[joins] )
  				)
  				.SetFromClause
  				(
! 					persister.FromTableFragment(alias) + 
! 					persister.FromJoinFragment(alias, true, true)
  				)
  				.SetOuterJoins
  				(
  					ojf.ToFromFragmentString,
! 					ojf.ToWhereFragmentString + 
! 					(
  						UseQueryWhereFragment ? 
  						( (IQueryable) persister).QueryWhereFragment(alias, true, true) :
--- 41,58 ----
  				SelectString(persister, alias, suffixes[joins] )
  				)
+ 				//TODO: HACK with ToString() required because of SetFromClause
  				.SetFromClause
  				(
! 					persister.FromTableFragment(alias).Append(
! 						persister.FromJoinFragment(alias, true, true)
! 					).ToString()
  				)
  				.SetOuterJoins
  				(
+ 				//TODO: ToWhereFragmentString.ToString() is a HACK - removed
+ 			
  					ojf.ToFromFragmentString,
! 					ojf.ToWhereFragmentString.Append( 
! 						//TODO: HACK with ToString() - removed
  						UseQueryWhereFragment ? 
  						( (IQueryable) persister).QueryWhereFragment(alias, true, true) :
***************
*** 87,100 ****
  				);
  
  			sqlBuilder.SetFromClause(
! 				persister.FromTableFragment(alias) + 
! 				persister.FromJoinFragment(alias, true, true) 
! 				);
  
  			sqlBuilder.AddWhereClause(condition);
  
  			sqlBuilder.SetOuterJoins(
  				ojf.ToFromFragmentString,
! 				ojf.ToWhereFragmentString + 
  				(
  					UseQueryWhereFragment ? 
--- 90,106 ----
  				);
  
+ 			//TODO: HACK with ToString() because of SetFromClause
  			sqlBuilder.SetFromClause(
! 				persister.FromTableFragment(alias).Append(
! 					persister.FromJoinFragment(alias, true, true)
! 				).ToString()
! 			);
  
  			sqlBuilder.AddWhereClause(condition);
  
+ 			//TODO: HACK with ToString()
  			sqlBuilder.SetOuterJoins(
  				ojf.ToFromFragmentString,
! 				ojf.ToWhereFragmentString.Append 
  				(
  					UseQueryWhereFragment ? 

Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OuterJoinLoader.cs	25 Jun 2004 20:33:02 -0000	1.12
--- OuterJoinLoader.cs	16 Aug 2004 05:26:39 -0000	1.13
***************
*** 8,12 ****
  using NHibernate.Engine;
  using NHibernate.Persister;
- using NHibernate.Sql;
  using NHibernate.SqlCommand;
  using NHibernate.Type;
--- 8,11 ----
***************
*** 425,430 ****
  		private static void AppendSelectString(StringBuilder buf, ILoadable persister, string alias, string suffix) 
  		{
! 			buf.Append( persister.IdentifierSelectFragment(alias,suffix) )
! 				.Append( persister.PropertySelectFragment(alias, suffix) );
  		}
  
--- 424,430 ----
  		private static void AppendSelectString(StringBuilder buf, ILoadable persister, string alias, string suffix) 
  		{
! 			//TODO: HACKs with ToString()
! 			buf.Append( persister.IdentifierSelectFragment(alias,suffix).ToString() )
! 				.Append( persister.PropertySelectFragment(alias, suffix).ToString() );
  		}
  
***************
*** 464,467 ****
--- 464,468 ----
  					JoinType.LeftOuterJoin
  					);
+ 				
  				outerjoin.AddJoins(
  					oj.Subpersister.FromJoinFragment(oj.Subalias, false, true),

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Loader.cs	14 Aug 2004 14:54:53 -0000	1.25
--- Loader.cs	16 Aug 2004 05:26:39 -0000	1.26
***************
*** 1,14 ****
  using System;
- using System.Data;
  using System.Collections;
  using NHibernate.Cfg;
  using NHibernate.Collection;
  using NHibernate.Engine;
- using NHibernate.Util;
  using NHibernate.Persister;
  using NHibernate.Transaction;
  using NHibernate.Type;
! using NHibernate.Sql;
! using NHibernate.SqlCommand;
  
  namespace NHibernate.Loader 
--- 1,14 ----
  using System;
  using System.Collections;
+ using System.Data;
+ 
  using NHibernate.Cfg;
  using NHibernate.Collection;
  using NHibernate.Engine;
  using NHibernate.Persister;
+ using NHibernate.SqlCommand;
  using NHibernate.Transaction;
  using NHibernate.Type;
! using NHibernate.Util;
  
  namespace NHibernate.Loader 

Index: OneToManyLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OneToManyLoader.cs	25 Jun 2004 20:33:02 -0000	1.7
--- OneToManyLoader.cs	16 Aug 2004 05:26:39 -0000	1.8
***************
*** 6,10 ****
  using NHibernate.Engine;
  using NHibernate.Persister;
- using NHibernate.Sql;
  using NHibernate.SqlCommand;
  using NHibernate.Type;
--- 6,9 ----
***************
*** 63,79 ****
  
  
  			selectBuilder.SetFromClause(
! 				persister.FromTableFragment(alias) +
! 				persister.FromJoinFragment(alias, true, true)
! 				);
  
  			selectBuilder.SetWhereClause(alias, collectionPersister.KeyColumnNames, collectionPersister.KeyType);
  			if(collectionPersister.HasWhere) selectBuilder.AddWhereClause(whereSqlString);
  
  			selectBuilder.SetOuterJoins(
  				ojf.ToFromFragmentString,
! 				ojf.ToWhereFragmentString +
! 				persister.WhereJoinFragment(alias, true, true)
! 				);
  
  			if(collectionPersister.HasOrdering) selectBuilder.SetOrderByClause( collectionPersister.GetSQLOrderByString(alias) );
--- 62,82 ----
  
  
+ 			//TODO: HACK with ToString() because of SetFromClause
  			selectBuilder.SetFromClause(
! 				persister.FromTableFragment(alias).Append(
! 					persister.FromJoinFragment(alias, true, true)
! 				).ToString()
! 			);
  
  			selectBuilder.SetWhereClause(alias, collectionPersister.KeyColumnNames, collectionPersister.KeyType);
  			if(collectionPersister.HasWhere) selectBuilder.AddWhereClause(whereSqlString);
  
+ 			//TODO: ToWhereFragmentString.ToString() is a HACK - removed
  			selectBuilder.SetOuterJoins(
  				ojf.ToFromFragmentString,
! 				ojf.ToWhereFragmentString.Append(
! 					persister.WhereJoinFragment(alias, true, true)
! 				)
! 			);
  
  			if(collectionPersister.HasOrdering) selectBuilder.SetOrderByClause( collectionPersister.GetSQLOrderByString(alias) );