Merge pull request ThatRendle#329 from sandranystrom/master

ThatRendle · ThatRendle · commit fc246cc4efa6 · 2014-03-31T13:54:37.000+01:00
Fixed bug when running IN-query on strings with InMemoryAdapter
diff --git a/Simple.Data.InMemoryTest/InMemoryTests.cs b/Simple.Data.InMemoryTest/InMemoryTests.cs
@@ -49,6 +49,18 @@ public void InsertAndFindAllShouldWork()
             Assert.AreEqual("Alice", record.Name);
         }
 
+        [Test]
+        public void InsertAndFindAllByStringTypeShouldWork()
+        {
+            Database.UseMockAdapter(new InMemoryAdapter());
+            var db = Database.Open();
+            db.Test.Insert(Id: 1, Name: "Alice");
+            db.Test.Insert(Id: 2, Name: "Bob");
+            List<dynamic> records = db.Test.FindAllByName(new[] { "Alice", "Bob" }).ToList();
+            Assert.IsNotNull(records);
+            Assert.AreEqual(2, records.Count);
+        }
+
         [Test]
         public void InsertAndFindWithTwoColumnsShouldWork()
         {
diff --git a/Simple.Data/QueryPolyfills/WhereClauseHandler.cs b/Simple.Data/QueryPolyfills/WhereClauseHandler.cs
@@ -100,7 +100,7 @@ private Func<IDictionary<string, object>, bool> EqualExpressionToWhereClause(Sim
                     d =>
                         {
                             var resolvedLeftOperand = Resolve(d, arg.LeftOperand);
-                            if (resolvedLeftOperand.OfType<IEnumerable>().Any())
+                            if (resolvedLeftOperand.Any(o => !(o is string) && o is IEnumerable))
                             {
                                 return resolvedLeftOperand.OfType<IEnumerable>().Any(
                                     o => o.Cast<object>().SequenceEqual(((IEnumerable)arg.RightOperand).Cast<object>()));

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private Func<IDictionary<string, object>, bool> EqualExpressionToWhereClause(Sim`
`100`	`100`	`d =>`
`101`	`101`	`{`
`102`	`102`	`var resolvedLeftOperand = Resolve(d, arg.LeftOperand);`
`103`		`- if (resolvedLeftOperand.OfType<IEnumerable>().Any())`
	`103`	`+ if (resolvedLeftOperand.Any(o => !(o is string) && o is IEnumerable))`
`104`	`104`	`{`
`105`	`105`	`return resolvedLeftOperand.OfType<IEnumerable>().Any(`
`106`	`106`	`o => o.Cast<object>().SequenceEqual(((IEnumerable)arg.RightOperand).Cast<object>()));`