Fix Queryable.Contains method for Linq provider (#2674)

Fixes #2544
nhibernate · Feb 15, 2021 · 7a77430 · 7a77430
1 parent 5ea209d
commit 7a77430
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 6 deletions.
diff --git a/src/NHibernate.Test/Async/Linq/MethodCallTests.cs b/src/NHibernate.Test/Async/Linq/MethodCallTests.cs
@@ -35,6 +35,18 @@ public async Task CanExecuteAnyWithArgumentsAsync()
 			Assert.IsFalse(result);
 		}
 
+		[Test]
+		public async Task CanExecuteContainsAsync()
+		{
+			var user = await (db.Users.FirstOrDefaultAsync());
+			var result = db.Users.Contains(user);
+			Assert.That(result, Is.True);
+
+			user = new User("test", DateTime.Now);
+			result = db.Users.Contains(user);
+			Assert.That(result, Is.False);
+		}
+
 		[Test]
 		public async Task CanExecuteCountWithOrderByArgumentsAsync()
 		{
@@ -163,4 +175,4 @@ public async Task CanSelectPropertiesIntoNestedObjectArraysAsync()
 			Assert.That(nestedNestedObjectArray[1], Is.EqualTo("ayende"));
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3850/MainFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3850/MainFixture.cs
@@ -187,6 +187,17 @@ public async Task AnyBBaseWithNameAsync()
 			}
 		}
 
+		[Test]
+		public async Task ContainsBBaseAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var item = await (session.Query<DomainClassBExtendedByA>().FirstAsync(dc => dc.Name == SearchName1));
+				var result = session.Query<DomainClassBExtendedByA>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public async Task AnyCBaseAsync()
@@ -213,6 +224,17 @@ public async Task AnyCBaseWithNameAsync()
 			}
 		}
 
+		[Test]
+		public async Task ContainsCBaseAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var item = await (session.Query<DomainClassCExtendedByD>().FirstAsync(dc => dc.Name == SearchName1));
+				var result = session.Query<DomainClassCExtendedByD>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public async Task AnyEAsync()
@@ -239,6 +261,17 @@ public async Task AnyEWithNameAsync()
 			}
 		}
 
+		[Test]
+		public async Task ContainsEAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var item = await (session.Query<DomainClassE>().FirstAsync(dc => dc.Name == SearchName1));
+				var result = session.Query<DomainClassE>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public async Task AnyFAsync()
@@ -291,6 +324,17 @@ public async Task AnyGBaseWithNameAsync()
 			}
 		}
 
+		[Test]
+		public async Task ContainsGBaseAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var item = await (session.Query<DomainClassGExtendedByH>().FirstAsync(dc => dc.Name == SearchName1));
+				var result = session.Query<DomainClassGExtendedByH>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Failing case till NH-3850 is fixed
 		[Test]
 		public async Task AnyObjectAsync()

diff --git a/src/NHibernate.Test/Linq/MethodCallTests.cs b/src/NHibernate.Test/Linq/MethodCallTests.cs
@@ -23,6 +23,18 @@ public void CanExecuteAnyWithArguments()
 			Assert.IsFalse(result);
 		}
 
+		[Test]
+		public void CanExecuteContains()
+		{
+			var user = db.Users.FirstOrDefault();
+			var result = db.Users.Contains(user);
+			Assert.That(result, Is.True);
+
+			user = new User("test", DateTime.Now);
+			result = db.Users.Contains(user);
+			Assert.That(result, Is.False);
+		}
+
 		[Test]
 		public void CanExecuteCountWithOrderByArguments()
 		{
@@ -151,4 +163,4 @@ public void CanSelectPropertiesIntoNestedObjectArrays()
 			Assert.That(nestedNestedObjectArray[1], Is.EqualTo("ayende"));
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3850/MainFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3850/MainFixture.cs
@@ -194,6 +194,17 @@ public void AnyBBaseWithName()
 			}
 		}
 
+		[Test]
+		public void ContainsBBase()
+		{
+			using (var session = OpenSession())
+			{
+				var item = session.Query<DomainClassBExtendedByA>().First(dc => dc.Name == SearchName1);
+				var result = session.Query<DomainClassBExtendedByA>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public void AnyCBase()
@@ -220,6 +231,17 @@ public void AnyCBaseWithName()
 			}
 		}
 
+		[Test]
+		public void ContainsCBase()
+		{
+			using (var session = OpenSession())
+			{
+				var item = session.Query<DomainClassCExtendedByD>().First(dc => dc.Name == SearchName1);
+				var result = session.Query<DomainClassCExtendedByD>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public void AnyE()
@@ -246,6 +268,17 @@ public void AnyEWithName()
 			}
 		}
 
+		[Test]
+		public void ContainsE()
+		{
+			using (var session = OpenSession())
+			{
+				var item = session.Query<DomainClassE>().First(dc => dc.Name == SearchName1);
+				var result = session.Query<DomainClassE>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public void AnyF()
@@ -272,6 +305,17 @@ public void AnyFWithName()
 			}
 		}
 
+		[Test]
+		public void ContainsF()
+		{
+			using (var session = OpenSession())
+			{
+				var item = new DomainClassF() {Id = -1};
+				var result = session.Query<DomainClassF>().Contains(item);
+				Assert.That(result, Is.False);
+			}
+		}
+
 		// Non-reg case
 		[Test]
 		public void AnyGBase()
@@ -298,6 +342,17 @@ public void AnyGBaseWithName()
 			}
 		}
 
+		[Test]
+		public void ContainsGBase()
+		{
+			using (var session = OpenSession())
+			{
+				var item = session.Query<DomainClassGExtendedByH>().First(dc => dc.Name == SearchName1);
+				var result = session.Query<DomainClassGExtendedByH>().Contains(item);
+				Assert.That(result, Is.True);
+			}
+		}
+
 		// Failing case till NH-3850 is fixed
 		[Test]
 		public void AnyObject()

diff --git a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessAny.cs b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessAny.cs
@@ -10,6 +10,11 @@ namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
 	public class ProcessAny : IResultOperatorProcessor<AnyResultOperator>
 	{
 		public void Process(AnyResultOperator anyOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
+		{
+			Process(tree);
+		}
+
+		internal static void Process(IntermediateHqlTree tree)
 		{
 			if (tree.IsRoot)
 			{
@@ -24,8 +29,8 @@ public void Process(AnyResultOperator anyOperator, QueryModelVisitor queryModelV
 			}
 			else
 			{
-				tree.SetRoot(tree.TreeBuilder.Exists((HqlQuery)tree.Root));
+				tree.SetRoot(tree.TreeBuilder.Exists((HqlQuery) tree.Root));
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessContains.cs b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessContains.cs
@@ -1,5 +1,8 @@
-using System.Collections;
+using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using NHibernate.Hql.Ast;
 using Remotion.Linq.Clauses.ResultOperators;
 
@@ -37,7 +40,7 @@ public void Process(ContainsResultOperator resultOperator, QueryModelVisitor que
 					tree.AddWhereClause(tree.TreeBuilder.Equality(
 						tree.TreeBuilder.Ident(GetFromAlias(tree.Root).AstNode.Text),
 						itemExpression));
-					tree.SetRoot(tree.TreeBuilder.Exists((HqlQuery)tree.Root));
+					ProcessAny.Process(tree);
 				}
 				else
 				{