[Nhibernate-commit] SF.net SVN: nhibernate:[4995] trunk/nhibernate/src/NHibernate

[<ric...@us...>]

Revision: 4995
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4995&view=rev
Author:   ricbrown
Date:     2010-06-28 10:32:18 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
Updated to IQueryOver.SelectList (syntax was clashing with .Select in intellisense).

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
    trunk/nhibernate/src/NHibernate/IQueryOver.cs
    trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
    trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs	2010-06-27 13:30:16 UTC (rev 4994)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs	2010-06-28 10:32:18 UTC (rev 4995)
@@ -318,7 +318,7 @@
 			return this;
 		}
 
-		public QueryOver<TRoot, TSubType> Select(Func<QueryOverProjectionBuilder<TSubType>, QueryOverProjectionBuilder<TSubType>> list)
+		public QueryOver<TRoot, TSubType> SelectList(Func<QueryOverProjectionBuilder<TSubType>, QueryOverProjectionBuilder<TSubType>> list)
 		{
 			criteria.SetProjection(list(new QueryOverProjectionBuilder<TSubType>()).ProjectionList);
 			return this;
@@ -681,8 +681,8 @@
 		IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.Select(params IProjection[] projections)
 		{ return Select(projections); }
 
-		IQueryOver<TRoot, TSubType> IQueryOver<TRoot, TSubType>.Select(Func<QueryOverProjectionBuilder<TSubType>, QueryOverProjectionBuilder<TSubType>> list)
-		{ return Select(list); }
+		IQueryOver<TRoot, TSubType> IQueryOver<TRoot, TSubType>.SelectList(Func<QueryOverProjectionBuilder<TSubType>, QueryOverProjectionBuilder<TSubType>> list)
+		{ return SelectList(list); }
 
 		IQueryOverOrderBuilder<TRoot,TSubType> IQueryOver<TRoot,TSubType>.OrderBy(Expression<Func<TSubType, object>> path)
 		{ return new IQueryOverOrderBuilder<TRoot,TSubType>(this, path); }

Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs	2010-06-27 13:30:16 UTC (rev 4994)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs	2010-06-28 10:32:18 UTC (rev 4995)
@@ -246,7 +246,7 @@
 		/// <summary>
 		/// Create a list of projections using a projection builder
 		/// </summary>
-		IQueryOver<TRoot, TSubType> Select(Func<QueryOverProjectionBuilder<TSubType>, QueryOverProjectionBuilder<TSubType>> list);
+		IQueryOver<TRoot, TSubType> SelectList(Func<QueryOverProjectionBuilder<TSubType>, QueryOverProjectionBuilder<TSubType>> list);
 
 		/// <summary>
 		/// Add order expressed as a lambda expression

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2010-06-27 13:30:16 UTC (rev 4994)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2010-06-28 10:32:18 UTC (rev 4995)
@@ -162,7 +162,7 @@
 				PersonSummary summary = null;
 				var actual =
 					s.QueryOver<Person>()
-						.Select(list => list
+						.SelectList(list => list
 							.SelectGroup(p => p.Name).WithAlias(() => summary.Name)
 							.Select(Projections.RowCount()).WithAlias(() => summary.Count))
 						.OrderByAlias(() => summary.Name).Asc
@@ -263,7 +263,7 @@
 
 				QueryOver<Child> averageChildAge =
 					QueryOver.Of<Child>()
-						.Select(p => p.SelectAvg(c => c.Age));
+						.SelectList(list => list.SelectAvg(c => c.Age));
 
 				QueryOver<Child> childCountQuery =
 					QueryOver.Of<Child>()
@@ -273,7 +273,7 @@
 				var nameAndChildCount =
 					s.QueryOver<Person>(() => personAlias)
 						.WithSubquery.Where(p => p.Age <= averageChildAge.As<int>())
-						.Select(list => list
+						.SelectList(list => list
 							.Select(p => p.Name)
 							.SelectSubQuery(childCountQuery).WithAlias(() => childCountAlias))
 						.OrderByAlias(() => childCountAlias).Desc

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs	2010-06-27 13:30:16 UTC (rev 4994)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs	2010-06-28 10:32:18 UTC (rev 4995)
@@ -114,7 +114,7 @@
 			Person personAgeProjectionAlias = null;
 			var actual =
 				CreateTestQueryOver<Person>(() => personAlias)
-					.Select(list => list
+				.SelectList(list => list
 						.SelectAvg(p => p.Age).WithAlias(() => personAgeProjectionAlias)
 						.Select(Projections.Avg("Age")) // allows private properties
 						.SelectAvg(() => personAlias.Age).WithAlias(() => personAlias.Age)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.