Fix after cherry-pick

Author: hazzik

src/NHibernate/Linq/Clauses/INhQueryModelVisitor.cs

@@ -5,6 +5,9 @@ namespace NHibernate.Linq.Clauses
 	public interface INhQueryModelVisitor: IQueryModelVisitor
 	{
 		void VisitNhJoinClause(NhJoinClause nhJoinClause, QueryModel queryModel, int index);
-		void VisitNhWhereClause(NhWhereClause nhWhereClause, QueryModel queryModel, int index);
+
+		void VisitNhWithClause(NhWithClause nhWhereClause, QueryModel queryModel, int index);
+
+		void VisitNhHavingClause(NhHavingClause nhWhereClause, QueryModel queryModel, int index);
 	}
 }

src/NHibernate/Linq/Clauses/NhHavingClause.cs

@@ -6,7 +6,7 @@
 
 namespace NHibernate.Linq.Clauses
 {
-	public class NhHavingClause : NhWhereClause
+	public class NhHavingClause : NhWhereClause, IBodyClause, IClause
 	{
 		public NhHavingClause(Expression predicate) 
 			: base(predicate)
@@ -17,9 +17,27 @@ public override string ToString()
 		{
 			return "having " + Predicate;
 		}
+
+		/// <summary>
+		/// Accepts the specified visitor by calling its <see cref="M:Remotion.Linq.IQueryModelVisitor.VisitWhereClause(Remotion.Linq.Clauses.WhereClause,Remotion.Linq.QueryModel,System.Int32)" /> method.
+		/// </summary>
+		/// <param name="visitor">The visitor to accept.</param>
+		/// <param name="queryModel">The query model in whose context this clause is visited.</param>
+		/// <param name="index">The index of this clause in the <paramref name="queryModel" />'s <see cref="P:Remotion.Linq.QueryModel.BodyClauses" /> collection.</param>
+		public override void Accept(IQueryModelVisitor visitor, QueryModel queryModel, int index)
+		{
+			if (visitor == null) throw new ArgumentNullException(nameof(visitor));
+			if (queryModel == null) throw new ArgumentNullException(nameof(queryModel));
+			((INhQueryModelVisitor) visitor).VisitNhHavingClause(this, queryModel, index);
+		}
+
+		IBodyClause IBodyClause.Clone(CloneContext cloneContext)
+		{
+			return Clone(cloneContext);
+		}
 	}
 
-	public class NhWhereClause : IBodyClause, IClause
+	public abstract class NhWhereClause
 	{
 		private Expression _predicate;
 
@@ -55,12 +73,7 @@ public NhWhereClause(Expression predicate)
 		/// <param name="visitor">The visitor to accept.</param>
 		/// <param name="queryModel">The query model in whose context this clause is visited.</param>
 		/// <param name="index">The index of this clause in the <paramref name="queryModel" />'s <see cref="P:Remotion.Linq.QueryModel.BodyClauses" /> collection.</param>
-		public void Accept(IQueryModelVisitor visitor, QueryModel queryModel, int index)
-		{
-			if (visitor == null) throw new ArgumentNullException(nameof(visitor));
-			if (queryModel == null) throw new ArgumentNullException(nameof(queryModel));
-			((INhQueryModelVisitor)visitor).VisitNhWhereClause(this, queryModel, index);
-		}
+		public abstract void Accept(IQueryModelVisitor visitor, QueryModel queryModel, int index);
 
 		/// <summary>
 		/// Transforms all the expressions in this clause and its child objects via the given <paramref name="transformation" /> delegate.
@@ -82,11 +95,6 @@ public WhereClause Clone(CloneContext cloneContext)
 			return new WhereClause(Predicate);
 		}
 
-		IBodyClause IBodyClause.Clone(CloneContext cloneContext)
-		{
-			return Clone(cloneContext);
-		}
-
 		public override string ToString()
 		{
 			return "where " + Predicate;

src/NHibernate/Linq/Clauses/NhWithClause.cs

@@ -1,10 +1,12 @@
+using System;
 using System.Linq.Expressions;
+using Remotion.Linq;
 using Remotion.Linq.Clauses;
 using Remotion.Linq.Clauses.ExpressionVisitors;
 
 namespace NHibernate.Linq.Clauses
 {
-	public class NhWithClause : NhWhereClause
+	public class NhWithClause : NhWhereClause, IBodyClause, IClause
 	{
 		public NhWithClause(Expression predicate)
 			: base(predicate)
@@ -15,5 +17,23 @@ public override string ToString()
 		{
 			return "with " + Predicate;
 		}
+
+		/// <summary>
+		/// Accepts the specified visitor by calling its <see cref="M:Remotion.Linq.IQueryModelVisitor.VisitWhereClause(Remotion.Linq.Clauses.WhereClause,Remotion.Linq.QueryModel,System.Int32)" /> method.
+		/// </summary>
+		/// <param name="visitor">The visitor to accept.</param>
+		/// <param name="queryModel">The query model in whose context this clause is visited.</param>
+		/// <param name="index">The index of this clause in the <paramref name="queryModel" />'s <see cref="P:Remotion.Linq.QueryModel.BodyClauses" /> collection.</param>
+		public override void Accept(IQueryModelVisitor visitor, QueryModel queryModel, int index)
+		{
+			if (visitor == null) throw new ArgumentNullException(nameof(visitor));
+			if (queryModel == null) throw new ArgumentNullException(nameof(queryModel));
+			((INhQueryModelVisitor)visitor).VisitNhWithClause(this, queryModel, index);
+		}
+
+		IBodyClause IBodyClause.Clone(CloneContext cloneContext)
+		{
+			return Clone(cloneContext);
+		}
 	}
 }

src/NHibernate/Linq/Visitors/NhQueryModelVisitorBase.cs

@@ -13,8 +13,9 @@ public virtual void VisitNhJoinClause(NhJoinClause joinClause, QueryModel queryM
 		{
 		}
 
-		public virtual void VisitNhWithClause(NhWithClause withClause, QueryModel queryModel, int index)
+		public virtual void VisitNhWithClause(NhWithClause nhWhereClause, QueryModel queryModel, int index)
 		{
+			
 		}
 	}
 }

src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

@@ -309,7 +309,7 @@ public override void VisitNhHavingClause(NhHavingClause havingClause, QueryModel
 			_hqlTree.AddHavingClause(expression);
 		}
 
-		public override void VisitNhWithClause(NhWithClause withClause, QueryModel queryModel, int index)
+		public virtual void VisitNhWithClause(NhWithClause withClause, QueryModel queryModel, int index)
 		{
 			var visitor = new SimplifyConditionalVisitor();
 			withClause.Predicate = visitor.Visit(withClause.Predicate);

src/NHibernate/NHibernate.csproj

@@ -303,7 +303,6 @@
     <Compile Include="ITransaction.cs" />
     <Compile Include="LazyInitializationException.cs" />
     <Compile Include="Linq\Visitors\NhQueryModelVisitorBase.cs" />
-    <Compile Include="Linq\Visitors\INhQueryModelVisitor.cs" />
     <Compile Include="Linq\Clauses\NhHavingClause.cs" />
     <Compile Include="Linq\Clauses\NhJoinClause.cs" />
     <Compile Include="Linq\Clauses\NhWithClause.cs" />