[Nhibernate-commit] nhibernate/src/NHibernate/Loader AbstractEntityLoader.cs,1.8,1.9 Loader.cs,1.27,1.28 OneToManyLoader.cs,1.8,1.9

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

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

Modified Files:
	AbstractEntityLoader.cs Loader.cs OneToManyLoader.cs 
Log Message:
removed [Obsolete] SQLString (not SqlString) property.

Index: AbstractEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractEntityLoader.cs	16 Aug 2004 05:26:39 -0000	1.8
--- AbstractEntityLoader.cs	19 Aug 2004 17:49:59 -0000	1.9
***************
*** 49,58 ****
  				)
  				.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) :
--- 49,55 ----
  				)
  				.SetOuterJoins
! 				(			
  					ojf.ToFromFragmentString,
  					ojf.ToWhereFragmentString.Append( 
  						UseQueryWhereFragment ? 
  						( (IQueryable) persister).QueryWhereFragment(alias, true, true) :
***************
*** 99,103 ****
  			sqlBuilder.AddWhereClause(condition);
  
- 			//TODO: HACK with ToString()
  			sqlBuilder.SetOuterJoins(
  				ojf.ToFromFragmentString,
--- 96,99 ----

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Loader.cs	18 Aug 2004 20:47:51 -0000	1.27
--- Loader.cs	19 Aug 2004 17:49:59 -0000	1.28
***************
*** 33,49 ****
  
  		/// <summary>
! 		/// The SQL query string to be called; implemented by all subclasses
! 		/// </summary>
! 		/// <remarks>
! 		/// TODO: This should be removed when the Implementation has gone completely SqlString() based.
! 		/// The only peice holding this up is the QueryTranslator.
! 		/// </remarks>
! 		[Obsolete("Should use SqlString instead of a string to hold the SQL")]
! 		public virtual string SQLString { 
! 			get { throw new NotImplementedException("This will be depreciated - don't use."); } 
! 		}
! 
! 		/// <summary>
! 		/// The SqlString to be called; implemented by alll subclasses
  		/// </summary>
  		public abstract SqlString SqlString {get;}
--- 33,37 ----
  
  		/// <summary>
! 		/// The SqlString to be called; implemented by all subclasses
  		/// </summary>
  		public abstract SqlString SqlString {get;}

Index: OneToManyLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OneToManyLoader.cs	16 Aug 2004 05:26:39 -0000	1.8
--- OneToManyLoader.cs	19 Aug 2004 17:49:59 -0000	1.9
***************
*** 72,76 ****
  			if(collectionPersister.HasWhere) selectBuilder.AddWhereClause(whereSqlString);
  
- 			//TODO: ToWhereFragmentString.ToString() is a HACK - removed
  			selectBuilder.SetOuterJoins(
  				ojf.ToFromFragmentString,
--- 72,75 ----