From: Michael D. <mik...@us...> - 2004-04-19 04:31:13
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16670/NHibernate/Sql Modified Files: QuerySelect.cs Log Message: no message Index: QuerySelect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Sql/QuerySelect.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** QuerySelect.cs 17 Mar 2003 21:13:53 -0000 1.3 --- QuerySelect.cs 19 Apr 2004 04:31:04 -0000 1.4 *************** *** 100,106 **** .Append("select "); if (distinct) buf.Append("distinct "); ! buf.Append(select) .Append(" from") ! .Append( joins.ToFromFragmentString.Substring(1) ); string part1 = joins.ToWhereFragmentString.Trim(); string part2 = where.ToString().Trim(); --- 100,117 ---- .Append("select "); if (distinct) buf.Append("distinct "); ! ! string from = joins.ToFromFragmentString; ! if ( from.StartsWith(",") ) ! { ! from = from.Substring(1); ! } ! else if ( from.StartsWith(" inner join") ) ! { ! from = from.Substring(11); ! } ! ! buf.Append(select.ToString()) .Append(" from") ! .Append( from ); string part1 = joins.ToWhereFragmentString.Trim(); string part2 = where.ToString().Trim(); |