Failing test

Author: bahusoid

src/NHibernate.Test/Async/Linq/ConstantTest.cs

@@ -11,12 +11,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using NHibernate.Criterion;
 using NHibernate.DomainModel.Northwind.Entities;
 using NHibernate.Engine.Query;
+using NHibernate.Linq;
 using NHibernate.Linq.Visitors;
 using NHibernate.Util;
 using NUnit.Framework;
-using NHibernate.Linq;
 
 namespace NHibernate.Test.Linq
 {

src/NHibernate.Test/Linq/ConstantTest.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using NHibernate.Criterion;
 using NHibernate.DomainModel.Northwind.Entities;
 using NHibernate.Engine.Query;
+using NHibernate.Linq;
 using NHibernate.Linq.Visitors;
 using NHibernate.Util;
 using NUnit.Framework;
@@ -257,6 +259,44 @@ public void PlansAreCached()
 			}
 		}
 
+		//GH-2298 - Different Update queries - same query cache plan
+		[Test]
+		public void DmlPlansAreProperlyHandled()
+		{
+			var queryPlanCacheType = typeof(QueryPlanCache);
+
+			var cache = (SoftLimitMRUCache)
+				queryPlanCacheType
+					.GetField("planCache", BindingFlags.Instance | BindingFlags.NonPublic)
+					.GetValue(Sfi.QueryPlanCache);
+			cache.Clear();
+
+			using (session.BeginTransaction())
+			{
+				using (var spy = new SqlLogSpy())
+				{
+					var listOfGuids = new[] {"UNKNOWN", "UNKNOWN2"}.ToList();
+					db.Customers.Where(x => listOfGuids.Contains(x.CustomerId)).Update(
+						x => new Customer
+						{
+							CompanyName = "Constant1"
+						});
+					
+					db.Customers.Where(x => listOfGuids.Contains(x.CustomerId))
+					.Update(
+						x => new Customer
+						{
+							ContactName = "Constant1"
+						});
+
+					Assert.That(
+						cache.Count,
+						Is.EqualTo(0).Or.EqualTo(2),
+						"Query plans should either be cached separately or not cached at all.");
+				}
+			}
+		}
+
 		[Test]
 		public void PlansWithNonParameterizedConstantsAreNotCached()
 		{