[Nhibernate-commit] nhibernate/src/NHibernate/Sql QuerySelect.cs,1.6,1.7 Alias.cs,1.7,NONE ANSIJoinFragment.cs,1.2,NONE InFragment.cs,1.4,NONE JoinFragment.cs,1.3,NONE OracleJoinFragment.cs,1.2,NONE OuterJoinFragment.cs,1.1,NONE QueryJoinFragment.cs,1.4,NONE

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

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

Modified Files:
	QuerySelect.cs 
Removed Files:
	Alias.cs ANSIJoinFragment.cs InFragment.cs JoinFragment.cs 
	OracleJoinFragment.cs OuterJoinFragment.cs 
	QueryJoinFragment.cs 
Log Message:
Began refactoring to SqlString.

--- QueryJoinFragment.cs DELETED ---

--- ANSIJoinFragment.cs DELETED ---

Index: QuerySelect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Sql/QuerySelect.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** QuerySelect.cs	1 Aug 2004 21:59:11 -0000	1.6
--- QuerySelect.cs	16 Aug 2004 05:18:52 -0000	1.7
***************
*** 13,17 ****
  	public class QuerySelect 
  	{		
! 		private JoinFragment joins;
  		private StringBuilder select = new StringBuilder();
  		private StringBuilder where = new StringBuilder();
--- 13,17 ----
  	public class QuerySelect 
  	{		
! 		private SqlCommand.JoinFragment joins;
  		private StringBuilder select = new StringBuilder();
  		private StringBuilder where = new StringBuilder();
***************
*** 54,61 ****
  		public QuerySelect(Dialect.Dialect dialect) 
  		{
! 			joins = new QueryJoinFragment(dialect, false);
  		}
  
! 		public JoinFragment JoinFragment 
  		{
  			get { return joins; }
--- 54,61 ----
  		public QuerySelect(Dialect.Dialect dialect) 
  		{
! 			joins = new SqlCommand.QueryJoinFragment(dialect, false);
  		}
  
! 		public SqlCommand.JoinFragment JoinFragment 
  		{
  			get { return joins; }
***************
*** 119,124 ****
  
  			if (distinct) buf.Append("distinct ");
! 
! 			string from = joins.ToFromFragmentString;
  			if ( from.StartsWith(",") ) 
  			{
--- 119,125 ----
  
  			if (distinct) buf.Append("distinct ");
! 			
! 			//TODO: HACK with ToString()
! 			string from = joins.ToFromFragmentString.ToString();
  			if ( from.StartsWith(",") ) 
  			{
***************
*** 134,138 ****
  				.Append( from );
  			
! 			string part1 = joins.ToWhereFragmentString.Trim();
  			string part2 = where.ToString().Trim();
  			bool hasPart1 = part1.Length > 0;
--- 135,140 ----
  				.Append( from );
  			
! 			//TODO: HACK with ToString()
! 			string part1 = joins.ToWhereFragmentString.ToString().Trim();
  			string part2 = where.ToString().Trim();
  			bool hasPart1 = part1.Length > 0;

--- OracleJoinFragment.cs DELETED ---

--- JoinFragment.cs DELETED ---

--- Alias.cs DELETED ---

--- OuterJoinFragment.cs DELETED ---

--- InFragment.cs DELETED ---