nhibernate-commit

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

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

Modified Files:
	NormalizedEntityPersister.cs 
Log Message:
fixed up aliasing in ToColumns and use of where attribute in 
QueryWhereFragment

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** NormalizedEntityPersister.cs	1 Aug 2004 15:00:18 -0000	1.22
--- NormalizedEntityPersister.cs	1 Aug 2004 21:58:02 -0000	1.23
***************
*** 1452,1456 ****
  			// make sure an Alias was actually passed into the statement
  			if(alias!=null && alias!=String.Empty) 
! 				return StringHelper.Prefix(cols, alias + StringHelper.Dot);
  			else 
  				return cols;
--- 1452,1456 ----
  			// make sure an Alias was actually passed into the statement
  			if(alias!=null && alias!=String.Empty) 
! 				return StringHelper.Prefix(cols, Alias(alias, tableIndex) + StringHelper.Dot);
  			else 
  				return cols;
***************
*** 1533,1537 ****
  		public override string QueryWhereFragment(string alias, bool innerJoin, bool includeSubclasses)  
  		{
! 			return WhereJoinFragment(alias, innerJoin, includeSubclasses);
  		}
  		
--- 1533,1539 ----
  		public override string QueryWhereFragment(string alias, bool innerJoin, bool includeSubclasses)  
  		{
! 			string result = WhereJoinFragment(alias, innerJoin, includeSubclasses);
! 			if( HasWhere ) result += " and " + GetSQLWhereString(alias);
! 			return result;
  		}