NH-3934 - Add methods to QueryOver WhereNot and AndNot with ICriterion as parameter

Author: KrzysztofLapinski

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

@@ -167,13 +167,16 @@ public void Negation()
 			ICriteria expected =
 				CreateTestCriteria(typeof(Person), "personAlias")
 					.Add(Restrictions.Not(Restrictions.Eq("Name", "test name")))
-					.Add(Restrictions.Not(Restrictions.Eq("personAlias.Name", "test name")));
+					.Add(Restrictions.Not(Restrictions.Eq("personAlias.Name", "test name")))
+					.Add(Restrictions.Not(Restrictions.Eq("Name", "not test name")));
+
 
 			Person personAlias = null;
 			IQueryOver<Person> actual =
 				CreateTestQueryOver<Person>(() => personAlias)
 					.AndNot(p => p.Name == "test name")
-					.AndNot(() => personAlias.Name == "test name");
+					.AndNot(() => personAlias.Name == "test name")
+					.AndNot(Restrictions.Eq("Name", "not test name"));
 
 			AssertCriteriaAreEqual(expected, actual);
 		}
@@ -187,14 +190,16 @@ public void Where_BehavesTheSameAs_And()
 					.And(() => personAlias.Name == "test name")
 					.And(p => p.Name == "test name")
 					.AndNot(() => personAlias.Name == "test name")
-					.AndNot(p => p.Name == "test name");
+					.AndNot(p => p.Name == "test name")
+					.AndNot(Restrictions.Eq("Name", "not test name"));
 
 			IQueryOver<Person> actual =
 				CreateTestQueryOver<Person>(() => personAlias)
 					.Where(() => personAlias.Name == "test name")
 					.Where(p => p.Name == "test name")
 					.WhereNot(() => personAlias.Name == "test name")
-					.WhereNot(p => p.Name == "test name");
+					.WhereNot(p => p.Name == "test name")
+					.WhereNot(Restrictions.Eq("Name", "not test name"));
 
 			AssertCriteriaAreEqual(expected.UnderlyingCriteria, actual);
 		}

src/NHibernate/Criterion/QueryOver.cs

@@ -342,6 +342,11 @@ public QueryOver<TRoot,TSubType> AndNot(Expression<Func<bool>> expression)
 			return AddNot(expression);
 		}
 
+		public QueryOver<TRoot, TSubType> AndNot(ICriterion expression)
+		{
+			return AddNot(expression);
+		}
+		
 		public QueryOverRestrictionBuilder<TRoot,TSubType> AndRestrictionOn(Expression<Func<TSubType, object>> expression)
 		{
 			return new QueryOverRestrictionBuilder<TRoot,TSubType>(this, ExpressionProcessor.FindMemberProjection(expression.Body));
@@ -377,6 +382,11 @@ public QueryOver<TRoot,TSubType> WhereNot(Expression<Func<bool>> expression)
 			return AddNot(expression);
 		}
 
+		public QueryOver<TRoot, TSubType> WhereNot(ICriterion expression)
+		{
+			return AddNot(expression);
+		}
+
 		public QueryOverRestrictionBuilder<TRoot,TSubType> WhereRestrictionOn(Expression<Func<TSubType, object>> expression)
 		{
 			return new QueryOverRestrictionBuilder<TRoot,TSubType>(this, ExpressionProcessor.FindMemberProjection(expression.Body));
@@ -774,7 +784,12 @@ private QueryOver<TRoot,TSubType> AddNot(Expression<Func<bool>> expression)
 			return this;
 		}
 
-
+		private QueryOver<TRoot, TSubType> AddNot(ICriterion expression)
+		{
+			criteria.Add(Restrictions.Not(expression));
+			return this;
+		}
+		
 		IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.And(Expression<Func<TSubType, bool>> expression)
 		{ return And(expression); }
 
@@ -787,7 +802,10 @@ IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.And(ICriterion expression)
 		IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.AndNot(Expression<Func<TSubType, bool>> expression)
 		{ return AndNot(expression); }
 
-		IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.AndNot(Expression<Func<bool>> expression)
+		IQueryOver<TRoot, TSubType> IQueryOver<TRoot, TSubType>.AndNot(Expression<Func<bool>> expression)
+		{ return AndNot(expression); }
+
+		IQueryOver<TRoot, TSubType> IQueryOver<TRoot, TSubType>.AndNot(ICriterion expression)
 		{ return AndNot(expression); }
 
 		IQueryOverRestrictionBuilder<TRoot,TSubType> IQueryOver<TRoot,TSubType>.AndRestrictionOn(Expression<Func<TSubType, object>> expression)
@@ -811,6 +829,9 @@ IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.WhereNot(Expression<Func<T
 		IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.WhereNot(Expression<Func<bool>> expression)
 		{ return WhereNot(expression); }
 
+		IQueryOver<TRoot, TSubType> IQueryOver<TRoot, TSubType>.WhereNot(ICriterion expression)
+		{ return WhereNot(expression); }
+
 		IQueryOverRestrictionBuilder<TRoot,TSubType> IQueryOver<TRoot,TSubType>.WhereRestrictionOn(Expression<Func<TSubType, object>> expression)
 		{ return new IQueryOverRestrictionBuilder<TRoot,TSubType>(this, ExpressionProcessor.FindMemberProjection(expression.Body)); }
 

src/NHibernate/IQueryOver.cs

@@ -210,6 +210,11 @@ public interface IQueryOver<TRoot,TSubType> : IQueryOver<TRoot>
 		/// <returns>criteria instance</returns>
 		IQueryOver<TRoot,TSubType> AndNot(Expression<Func<bool>> expression);
 
+		/// <summary>
+		/// Add negation of criterion expressed as ICriterion
+		/// </summary>
+		IQueryOver<TRoot, TSubType> AndNot(ICriterion expression);
+
 		/// <summary>
 		/// Add restriction to a property
 		/// </summary>
@@ -257,6 +262,11 @@ public interface IQueryOver<TRoot,TSubType> : IQueryOver<TRoot>
 		/// <returns>criteria instance</returns>
 		IQueryOver<TRoot,TSubType> WhereNot(Expression<Func<bool>> expression);
 
+		/// <summary>
+		/// Identical semantics to AndNot() to allow more readable queries
+		/// </summary>
+		IQueryOver<TRoot, TSubType> WhereNot(ICriterion expression);
+
 		/// <summary>
 		/// Identical semantics to AndRestrictionOn() to allow more readable queries
 		/// </summary>