Add more tests for merging params

Author: mythz

tests/ServiceStack.OrmLite.Tests/Issues/MergingNestedSqlExpressionIssue.cs

@@ -32,15 +32,35 @@ public void Does_merge_subselect_params_correctly()
             ids.Where(x => x.HasA == true && x.HasB == true && x.HasC == true);
             ids.SelectDistinct(x => x.OrganizationId);
 
-            // select organizations
-            var expression = OrmLiteConfig.DialectProvider.SqlExpression<Organization>();
-            // that are active
-            expression.Where(x => x.IsActive == true);
-            // and belong to the same group
-            expression.Where(x => Sql.In(x.Id, ids));
-
-            Assert.That(expression.WhereExpression, Is.EqualTo(
+            //0 params
+            var q = OrmLiteConfig.DialectProvider.SqlExpression<Organization>(); 
+            q.Where(x => Sql.In(x.Id, ids));
+            Assert.That(q.WhereExpression, Is.EqualTo(
+                "WHERE \"Id\" IN (SELECT DISTINCT \"OrganizationId\" \nFROM \"OrganizationMembership\"\nWHERE (((\"HasA\" = @0) AND (\"HasB\" = @1)) AND (\"HasC\" = @2)))"));
+
+            //1 param
+            q = OrmLiteConfig.DialectProvider.SqlExpression<Organization>();
+            q.Where(x => x.IsActive == true);
+            q.Where(x => Sql.In(x.Id, ids));
+            Assert.That(q.WhereExpression, Is.EqualTo(
                 "WHERE (\"IsActive\" = @0) AND \"Id\" IN (SELECT DISTINCT \"OrganizationId\" \nFROM \"OrganizationMembership\"\nWHERE (((\"HasA\" = @1) AND (\"HasB\" = @2)) AND (\"HasC\" = @3)))"));
+
+            //2 params
+            q = OrmLiteConfig.DialectProvider.SqlExpression<Organization>();
+            q.Where(x => x.IsActive == true);
+            q.Where(x => x.IsActive == true);
+            q.Where(x => Sql.In(x.Id, ids));
+            Assert.That(q.WhereExpression, Is.EqualTo(
+                "WHERE (\"IsActive\" = @0) AND (\"IsActive\" = @1) AND \"Id\" IN (SELECT DISTINCT \"OrganizationId\" \nFROM \"OrganizationMembership\"\nWHERE (((\"HasA\" = @2) AND (\"HasB\" = @3)) AND (\"HasC\" = @4)))"));
+
+            //3 params
+            q = OrmLiteConfig.DialectProvider.SqlExpression<Organization>();
+            q.Where(x => x.IsActive == true);
+            q.Where(x => x.IsActive == true);
+            q.Where(x => x.IsActive == true);
+            q.Where(x => Sql.In(x.Id, ids));
+            Assert.That(q.WhereExpression, Is.EqualTo(
+                "WHERE (\"IsActive\" = @0) AND (\"IsActive\" = @1) AND (\"IsActive\" = @2) AND \"Id\" IN (SELECT DISTINCT \"OrganizationId\" \nFROM \"OrganizationMembership\"\nWHERE (((\"HasA\" = @3) AND (\"HasB\" = @4)) AND (\"HasC\" = @5)))"));
         }
     }
 }