- Added UniqueResult<T> to ICriteria

- Added UniqueResult<T> to IQuery
- Ported DetachedCriteria from Hibernate 3

SVN: trunk@2338

Author: ayende

src/NHibernate.Test/ExpressionTest/DetachedCriteriaFixture.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using NHibernate.DomainModel;
+using NHibernate.Expression;
+using NExpression = NHibernate.Expression.Expression;
+using NUnit.Framework;
+
+namespace NHibernate.Test.ExpressionTest
+{
+	[TestFixture]
+	public class DetachedCriteriaFixture : TestCase
+	{
+
+		protected override IList Mappings
+		{
+			get
+			{
+				return new string[] { "Componentizable.hbm.xml" };
+			}
+		}
+		
+		[Test]
+		public void CanUseDetachedCriteriaToQuery()
+		{
+			using (ISession s = OpenSession())
+			{
+				Componentizable master = new Componentizable();
+				master.NickName = "master";
+				s.Save(master);
+				s.Flush();
+			}
+
+			DetachedCriteria detachedCriteria = DetachedCriteria.For(typeof(Componentizable));
+			detachedCriteria.Add(NExpression.Eq("NickName","master"));
+
+			using (ISession s = OpenSession())
+			{
+				Componentizable componentizable = (Componentizable)detachedCriteria.GetExecutableCriteria(s).UniqueResult();
+				Assert.AreEqual("master", componentizable.NickName);
+				s.Delete(componentizable);
+				s.Flush();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test-2.0.csproj

@@ -90,6 +90,7 @@
     <Compile Include="ExceptionsTest\PropertyAccessExceptionFixture.cs" />
     <Compile Include="ExpressionTest\BaseExpressionFixture.cs" />
     <Compile Include="ExpressionTest\BetweenExpressionFixture.cs" />
+    <Compile Include="ExpressionTest\DetachedCriteriaFixture.cs" />
     <Compile Include="ExpressionTest\InExpressionFixture.cs" />
     <Compile Include="ExpressionTest\InsensitiveLikeExpressionFixture.cs" />
     <Compile Include="ExpressionTest\JunctionFixture.cs" />

src/NHibernate/Expression/DetachedCriteria.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Impl;
+using NHibernate.Transform;
+
+namespace NHibernate.Expression
+{
+	/// <summary>
+	/// Some applications need to create criteria queries in "detached
+	/// mode", where the Hibernate session is not available. This class
+	/// may be instantiated anywhere, and then a <c>ICriteria</c>
+	/// may be obtained by passing a session to 
+	/// <c>GetExecutableCriteria()</c>. All methods have the
+	/// same semantics and behavior as the corresponding methods of the
+	/// <c>ICriteria</c> interface.
+	/// </summary>
+	public class DetachedCriteria
+	{
+		private CriteriaImpl impl;
+		private ICriteria criteria;
+
+		protected DetachedCriteria(System.Type entityType)
+		{
+			impl = new CriteriaImpl(entityType, null);
+			criteria = impl;
+		}
+
+		protected DetachedCriteria(System.Type entityType, String alias)
+		{
+			impl = new CriteriaImpl(entityType, alias, null);
+			criteria = impl;
+		}
+
+		protected DetachedCriteria(CriteriaImpl impl, ICriteria criteria)
+		{
+			this.impl = impl;
+			this.criteria = criteria;
+		}
+
+		/// <summary>
+		/// Get an executable instance of <c>Criteria</c>,
+		/// to actually run the query.</summary>
+		public ICriteria GetExecutableCriteria(ISession session)
+		{
+			impl.Session = (SessionImpl) session;
+			return impl;
+		}
+
+		public static DetachedCriteria For(System.Type entityType)
+		{
+			return new DetachedCriteria(entityType);
+		}
+
+#if NET_2_0
+		public static DetachedCriteria For<T>()
+		{
+			return new DetachedCriteria(typeof (T));
+		}
+#endif
+
+		public static DetachedCriteria For(System.Type entityType, String alias)
+		{
+			return new DetachedCriteria(entityType, alias);
+		}
+
+
+		public DetachedCriteria Add(ICriterion criterion)
+		{
+			criteria.Add(criterion);
+			return this;
+		}
+
+		public DetachedCriteria AddOrder(Order order)
+		{
+			criteria.AddOrder(order);
+			return this;
+		}
+
+		public DetachedCriteria CreateAlias(String associationPath, String alias)
+		{
+			criteria.CreateAlias(associationPath, alias);
+			return this;
+		}
+
+		public DetachedCriteria createCriteria(String associationPath, String alias)
+		{
+			return new DetachedCriteria(impl, criteria.CreateCriteria(associationPath));
+		}
+
+		public DetachedCriteria createCriteria(String associationPath)
+		{
+			return new DetachedCriteria(impl, criteria.CreateCriteria(associationPath));
+		}
+
+		public String Alias
+		{
+			get { return criteria.Alias; }
+		}
+
+		public DetachedCriteria SetFetchMode(String associationPath, FetchMode mode)
+		{
+			criteria.SetFetchMode(associationPath, mode);
+			return this;
+		}
+
+		public DetachedCriteria SetProjection(IProjection projection)
+		{
+			criteria.SetProjection(projection);
+			return this;
+		}
+
+		public DetachedCriteria SetResultTransformer(IResultTransformer resultTransformer)
+		{
+			criteria.SetResultTransformer(resultTransformer);
+			return this;
+		}
+
+		public override String ToString()
+		{
+			return "DetachableCriteria(" + criteria.ToString() + ')';
+		}
+	}
+}

src/NHibernate/ICriteria.cs

@@ -103,6 +103,11 @@ public interface ICriteria
 		/// Strongly-typed version of <see cref="List()" />.
 		/// </summary>
 		IList<T> List<T>();
+
+		/// <summary>
+		/// Strongly-typed version of <see cref="UniqueResult()" />.
+		/// </summary>
+		T UniqueResult<T>();
 #endif
 
 		/// <summary>

src/NHibernate/IQuery.cs

@@ -130,6 +130,13 @@ public interface IQuery
 		/// </exception>
 		object UniqueResult();
 
+
+#if NET_2_0
+		/// <summary>
+		/// Strongly-typed version of <see cref="UniqueResult()"/>.
+		/// </summary>
+		T UniqueResult<T>();
+#endif
 		/// <summary>
 		/// Set the maximum number of rows to retrieve.
 		/// </summary>

src/NHibernate/Impl/AbstractQueryImpl.cs

@@ -597,6 +597,11 @@ internal ISessionImplementor Session
 			get { return session; }
 		}
 
+		public T UniqueResult<T>()
+		{
+			return (T) UniqueResult();
+		}
+		
 		public object UniqueResult()
 		{
 			return UniqueElement( List() );

src/NHibernate/Impl/CriteriaImpl.cs

@@ -117,6 +117,11 @@ public IList<T> List<T>()
 			{
 				return root.List<T>();
 			}
+			
+			public T UniqueResult<T>()
+			{
+				return (T) UniqueResult();
+			}
 #endif
 
 			public object UniqueResult()
@@ -307,6 +312,12 @@ public IList<T> List<T>()
 		{
 			return session.Find<T>( this );
 		}
+		
+		public T UniqueResult<T>()
+		{
+			return (T) UniqueResult();
+		}
+		
 #endif
 
 		public IEnumerable IterateExpressionEntries()
@@ -434,6 +445,12 @@ public bool Cacheable
 			get { return cacheable; }
 		}
 
+		internal SessionImpl Session
+		{
+			get { return session; }
+			set { session = value; }
+		}
+
 		public string CacheRegion
 		{
 			get { return cacheRegion; }

src/NHibernate/NHibernate-2.0.csproj

@@ -519,6 +519,7 @@
     <Compile Include="Driver\ISqlParameterFormatter.cs" />
     <Compile Include="Driver\SqlStringFormatter.cs" />
     <Compile Include="Engine\FilterDefinition.cs" />
+    <Compile Include="Expression\DetachedCriteria.cs" />
     <Compile Include="Engine\JoinSequence.cs" />
     <Compile Include="Hql\CollectionSubqueryFactory.cs" />
     <Compile Include="Expression\IsEmptyExpression.cs" />
@@ -722,4 +723,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>