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

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

Revision: 4898
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4898&view=rev
Author:   ricbrown
Date:     2010-01-04 15:35:10 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
Renamed QueryOver.Single() to SingleOrDefault() to closer mimic semantics of Linq extension methods of the same name.

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

Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs	2010-01-04 15:20:56 UTC (rev 4897)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs	2010-01-04 15:35:10 UTC (rev 4898)
@@ -56,12 +56,12 @@
 			return criteria.List<U>();
 		}
 
-		private TRoot Single()
+		private TRoot SingleOrDefault()
 		{
 			return criteria.UniqueResult<TRoot>();
 		}
 
-		private U Single<U>()
+		private U SingleOrDefault<U>()
 		{
 			return criteria.UniqueResult<U>();
 		}
@@ -125,11 +125,11 @@
 		IList<U> IQueryOver<TRoot>.List<U>()
 		{ return List<U>(); }
 
-		TRoot IQueryOver<TRoot>.Single()
-		{ return Single(); }
+		TRoot IQueryOver<TRoot>.SingleOrDefault()
+		{ return SingleOrDefault(); }
 
-		U IQueryOver<TRoot>.Single<U>()
-		{ return Single<U>(); }
+		U IQueryOver<TRoot>.SingleOrDefault<U>()
+		{ return SingleOrDefault<U>(); }
 
 		IEnumerable<TRoot> IQueryOver<TRoot>.Future()
 		{ return Future(); }

Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs	2010-01-04 15:20:56 UTC (rev 4897)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs	2010-01-04 15:35:10 UTC (rev 4898)
@@ -49,12 +49,12 @@
 		/// <exception cref="HibernateException">
 		/// If there is more than one matching result
 		/// </exception>
-		TRoot Single();
+		TRoot SingleOrDefault();
 
 		/// <summary>
-		/// Override type of <see cref="Single()" />.
+		/// Override type of <see cref="SingleOrDefault()" />.
 		/// </summary>
-		U Single<U>();
+		U SingleOrDefault<U>();
 
 		/// <summary>
 		/// Get a enumerable that when enumerated will execute

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2010-01-04 15:20:56 UTC (rev 4897)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2010-01-04 15:35:10 UTC (rev 4898)
@@ -159,7 +159,7 @@
 			{
 				Person actual =
 					s.QueryOver<Person>()
-						.Single();
+						.SingleOrDefault();
 
 				Assert.That(actual.Name, Is.EqualTo("test person 1"));
 			}
@@ -169,7 +169,7 @@
 				string actual =
 					s.QueryOver<Person>()
 						.Select(p => p.Name)
-						.Single<string>();
+						.SingleOrDefault<string>();
 
 				Assert.That(actual, Is.EqualTo("test person 1"));
 			}


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