Add missing options to QueryOver

src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs

@@ -1,13 +1,8 @@
 using System;
-using System.Collections;
-
 using NUnit.Framework;
-
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
 using NHibernate.Transform;
-using NHibernate.Type;
-using NHibernate.Util;
 
 namespace NHibernate.Test.Criteria.Lambda
 {
@@ -928,6 +923,48 @@ public void Readonly()
 			AssertCriteriaAreEqual(expected, actual);
 		}
 
+		[Test]
+		public void SetTimeout()
+		{
+			var expected =
+				CreateTestCriteria(typeof(Person))
+					.SetTimeout(3);
+
+			var actual =
+				CreateTestQueryOver<Person>()
+					.SetTimeout(3);
+
+			AssertCriteriaAreEqual(expected, actual);
+		}
+
+		[Test]
+		public void SetFetchSize()
+		{
+			var expected =
+				CreateTestCriteria(typeof(Person))
+					.SetFetchSize(3);
+
+			var actual =
+				CreateTestQueryOver<Person>()
+					.SetFetchSize(3);
+
+			AssertCriteriaAreEqual(expected, actual);
+		}
+
+		[Test]
+		public void SetComment()
+		{
+			var expected =
+				CreateTestCriteria(typeof(Person))
+					.SetComment("blah");
+
+			var actual =
+				CreateTestQueryOver<Person>()
+					.SetComment("blah");
+
+			AssertCriteriaAreEqual(expected, actual);
+		}
+
 		[Test]
 		public void DetachedQueryOver()
 		{

src/NHibernate/QueryOverExtensions.cs

@@ -0,0 +1,43 @@
+namespace NHibernate
+{
+	// 6.0 TODO: consider moving other criteria delegated methods to extension methods.
+	// It may allow better return typing for chaining, and it is slightly less code.
+	public static class QueryOverExtensions
+	{
+		/// <summary>
+		/// Set a timeout for the underlying ADO.NET query.
+		/// </summary>
+		/// <param name="queryOver">The query on which to set the timeout.</param>
+		/// <param name="timeout">The timeout in seconds.</param>
+		/// <returns><see langword="this" /> (for method chaining).</returns>
+		public static TQueryOver SetTimeout<TQueryOver>(this TQueryOver queryOver, int timeout) where TQueryOver: IQueryOver
+		{
+			queryOver.RootCriteria.SetTimeout(timeout);
+			return queryOver;
+		}
+
+		/// <summary>
+		/// Set a fetch size for the underlying ADO query.
+		/// </summary>
+		/// <param name="queryOver">The query on which to set the timeout.</param>
+		/// <param name="fetchSize">The fetch size.</param>
+		/// <returns><see langword="this" /> (for method chaining).</returns>
+		public static TQueryOver SetFetchSize<TQueryOver>(this TQueryOver queryOver, int fetchSize) where TQueryOver: IQueryOver
+		{
+			queryOver.RootCriteria.SetFetchSize(fetchSize);
+			return queryOver;
+		}
+
+		/// <summary>
+		/// Add a comment to the generated SQL.
+		/// </summary>
+		/// <param name="queryOver">The query on which to set the timeout.</param>
+		/// <param name="comment">A human-readable string.</param>
+		/// <returns><see langword="this" /> (for method chaining).</returns>
+		public static TQueryOver SetComment<TQueryOver>(this TQueryOver queryOver, string comment) where TQueryOver: IQueryOver
+		{
+			queryOver.RootCriteria.SetComment(comment);
+			return queryOver;
+		}
+	}
+}