add support for Contains in IEnumerable litedb-org#652

RytisLT · Jul 18, 2017 · 74222c8 · 74222c8
1 parent 34e8a79
commit 74222c8
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 2 deletions.
diff --git a/LiteDB.Tests/Database/LinqContainsTests.cs b/LiteDB.Tests/Database/LinqContainsTests.cs
@@ -0,0 +1,58 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LiteDB.Tests.Database
+{
+    [TestClass]
+    public class LinqContainsTests
+    {
+        private TempFile _tempFile;
+        private LiteDatabase _database;
+        private LiteCollection<ItemWithEnumerable> _collection;
+
+        public class ItemWithEnumerable
+        {
+            public int[] Array { get; set; }
+
+            public IEnumerable<int> Enumerable { get; set; }
+        }
+
+        [TestInitialize]
+        public void Init()
+        {
+            _tempFile = new TempFile();
+            _database = new LiteDatabase(_tempFile.Filename);
+            _collection = _database.GetCollection<ItemWithEnumerable>("items");
+
+            var item = new ItemWithEnumerable()
+            {
+                Array = new int[] { 1 },
+                Enumerable = new List<int>() { 2 },
+            };
+
+            _collection.Insert(item);
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            _database.Dispose();
+            _tempFile.Dispose();
+        }
+
+        [TestMethod]
+        public void ArrayContains()
+        {
+            var result = _collection.Find(i => i.Array.Contains(1)).ToList();
+            Assert.AreEqual(1, result.Count);
+        }
+
+        [TestMethod]
+        public void ListContains()
+        {
+            var result = _collection.Find(i => i.Enumerable.Contains(2)).ToList();
+            Assert.AreEqual(1, result.Count);
+        }
+    }
+}
diff --git a/LiteDB.Tests/LiteDB.Tests.csproj b/LiteDB.Tests/LiteDB.Tests.csproj
@@ -69,6 +69,7 @@
     <Compile Include="Concurrency\ProcessTest.cs" />
     <Compile Include="Database\BigDatabaseTest.cs" />
     <Compile Include="Database\AutoIndexDatabaseTest.cs" />
+    <Compile Include="Database\LinqContainsTests.cs" />
     <Compile Include="Database\LockTimeoutTests.cs" />
     <Compile Include="Engine\JournalTest.cs" />
     <Compile Include="Database\ULongListTest.cs" />

diff --git a/LiteDB/Mapper/Linq/QueryVisitor.cs b/LiteDB/Mapper/Linq/QueryVisitor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
 using ParameterDictionary = System.Collections.Generic.Dictionary<System.Linq.Expressions.ParameterExpression, LiteDB.BsonValue>;
 
 namespace LiteDB
@@ -159,6 +157,14 @@ private Query VisitExpression(Expression expr, string prefix = null)
 
                     return Query.EQ(field, value);
                 }
+                else if (method == "Contains" && typeof(IEnumerable).IsAssignableFrom(type))
+                {
+                    var field = this.GetField(met.Object, prefix);
+                    var value = this.VisitValue(met.Arguments[0], null);
+
+                    return Query.EQ(field, value);
+                }
+
                 // Any (Enumerable): x.Customer.Any(z => z.Name.StartsWith("John"))
                 else if(method == "Any" && type == typeof(Enumerable) && paramType == ExpressionType.Parameter)
                 {