Change Sql.In to work as expected

Author: mythz

src/ServiceStack.OrmLite.Sqlite/SqliteExpressionVisitor.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.Linq.Expressions;
@@ -49,27 +50,14 @@ protected override object VisitSqlMethodCall(MethodCallExpression m)
                     var lambda = Expression.Lambda<Func<object>>(member);
                     var getter = lambda.Compile();
 
-                    var inArgs = getter() as object[];
+                    var inArgs = Sql.Flatten(getter() as IEnumerable);
 
                     var sIn = new StringBuilder();
                     foreach (var e in inArgs)
                     {
-                        if (e.GetType().ToString() != "System.Collections.Generic.List`1[System.Object]")
-                        {
-                            sIn.AppendFormat("{0}{1}",
-                                         sIn.Length > 0 ? "," : "",
-                                         OrmLiteConfig.DialectProvider.GetQuotedValue(e, e.GetType()));
-                        }
-                        else
-                        {
-                            var listArgs = e as IList<Object>;
-                            foreach (Object el in listArgs)
-                            {
-                                sIn.AppendFormat("{0}{1}",
-                                         sIn.Length > 0 ? "," : "",
-                                         OrmLiteConfig.DialectProvider.GetQuotedValue(el, el.GetType()));
-                            }
-                        }
+                        sIn.AppendFormat("{0}{1}",
+                                     sIn.Length > 0 ? "," : "",
+                                     OrmLiteConfig.DialectProvider.GetQuotedValue(e, e.GetType()));
                     }
                     statement = string.Format("{0} {1} ({2})", quotedColName, m.Method.Name, sIn);
                     break;

src/ServiceStack.OrmLite/Expressions/Sql.cs

@@ -1,26 +1,40 @@
-using System;
-using System.Linq;
-using System.Linq.Expressions;
+using System.Collections;
+using System.Linq;
 using System.Collections.Generic;
+
 namespace ServiceStack.OrmLite
 {
 	public static class Sql
 	{
-		public static bool In<T>(T value, params object[] list)
-		{
-			if(value == null)
-				return false;
+        public static bool In<T, TItem>(T value, params TItem[] list)
+        {
+            return value != null && Flatten(list).Any(obj => obj.ToString() == value.ToString());
+        }
+
+	    public static List<object> Flatten(IEnumerable list)
+        {
+            var ret = new List<object>();
+	        if (list == null) return ret;
 
-			foreach (var obj in list)
-			{
-				if (obj == null) continue;
-				if (obj.ToString() == value.ToString()) return true;
-			}
+            foreach (var item in list)
+            {
+                if (item == null) continue;
 
-			return false;
-		}
+                var arr = item as IEnumerable;
+                if (arr != null && !(item is string))
+                {
+                    ret.AddRange(arr.Cast<object>());
+                }
+                else
+                {
+                    ret.Add(item);
+                }
+            }
+            return ret;
+        }
 
-		public static string Desc<T>(T value) {
+	    public static string Desc<T>(T value)
+        {
 			return  value==null? "": value.ToString() + " DESC";
 		}
 

tests/ServiceStack.OrmLite.Tests/ExpressionTests.cs

@@ -0,0 +1,58 @@
+using System.Linq;
+using NUnit.Framework;
+using ServiceStack.OrmLite.Sqlite;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests
+{
+    [TestFixture]
+    public class ExpressionTests
+    {
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            OrmLiteConfig.DialectProvider = new SqliteOrmLiteDialectProvider();
+        }
+
+        public static SqliteExpressionVisitor<Person> expr()
+        {
+            return new SqliteExpressionVisitor<Person>();
+        }
+
+        [Test]
+        public void Does_support_Sql_In_on_int_collections()
+        {
+            var ids = new[] { 1, 2, 3 };
+
+            Assert.That(expr().Where(q => Sql.In(q.Id, 1, 2, 3)).WhereExpression,
+                Is.EqualTo("WHERE \"Id\" In (1,2,3)"));
+
+            Assert.That(expr().Where(q => Sql.In(q.Id, ids)).WhereExpression,
+                Is.EqualTo("WHERE \"Id\" In (1,2,3)"));
+
+            Assert.That(expr().Where(q => Sql.In(q.Id, ids.ToList())).WhereExpression,
+                Is.EqualTo("WHERE \"Id\" In (1,2,3)"));
+
+            Assert.That(expr().Where(q => Sql.In(q.Id, ids.ToList().Cast<object>())).WhereExpression,
+                Is.EqualTo("WHERE \"Id\" In (1,2,3)"));
+        }
+
+        [Test]
+        public void Does_support_Sql_In_on_string_collections()
+        {
+            var ids = new[] { "A", "B", "C" };
+
+            Assert.That(expr().Where(q => Sql.In(q.FirstName, "A", "B", "C")).WhereExpression,
+                Is.EqualTo("WHERE \"FirstName\" In ('A','B','C')"));
+
+            Assert.That(expr().Where(q => Sql.In(q.FirstName, ids)).WhereExpression,
+                Is.EqualTo("WHERE \"FirstName\" In ('A','B','C')"));
+
+            Assert.That(expr().Where(q => Sql.In(q.FirstName, ids.ToList())).WhereExpression,
+                Is.EqualTo("WHERE \"FirstName\" In ('A','B','C')"));
+
+            Assert.That(expr().Where(q => Sql.In(q.FirstName, ids.ToList().Cast<object>())).WhereExpression,
+                Is.EqualTo("WHERE \"FirstName\" In ('A','B','C')"));
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -100,6 +100,7 @@
   <ItemGroup>
     <Compile Include="ApiExpressionTests.cs" />
     <Compile Include="EnumTests.cs" />
+    <Compile Include="ExpressionTests.cs" />
     <Compile Include="ExpressionVisitorTests.cs" />
     <Compile Include="Expression\AdditiveExpressionsTest.cs" />
     <Compile Include="Expression\ConditionalExpressionTest.cs" />