Add ISqlExpression on JoinSqlBuilder and SqlBuilder

Author: mythz

src/ServiceStack.OrmLite/Expressions/ReadConnectionExtensions.cs

@@ -111,9 +111,9 @@ public static List<T> Select<T>(this IDbConnection dbConn, SqlExpression<T> expr
         /// Returns results from using an SqlExpression lambda. E.g:
         /// <para>db.Select(db.From&lt;Person&gt;().Where(x =&gt; x.Age &gt; 40))</para>
         /// </summary>
-        public static List<T> Select<T>(this IDbConnection dbConn, ISqlExpression expression)
+        public static List<T> Select<T>(this IDbConnection dbConn, ISqlExpression expression, object anonType = null)
         {
-            return dbConn.Exec(dbCmd => dbCmd.SqlList<T>(expression.ToSelectStatement()));
+            return dbConn.Exec(dbCmd => dbCmd.SqlList<T>(expression.ToSelectStatement(), anonType));
         }
 
         /// <summary>

src/ServiceStack.OrmLite/JoinSqlBuilder.cs

@@ -6,7 +6,7 @@
 
 namespace ServiceStack.OrmLite
 {
-    public class JoinSqlBuilder<TNewPoco, TBasePoco>
+    public class JoinSqlBuilder<TNewPoco, TBasePoco> : ISqlExpression
     {
         private List<Join> joinList = new List<Join>();
         private List<KeyValuePair<string, WhereType>> whereList = new List<KeyValuePair<string, WhereType>>();
@@ -418,6 +418,11 @@ private void CheckAggregateUsage(bool ignoreCurrentItem)
             }
         }
 
+        public string ToSelectStatement()
+        {
+            return ToSql();
+        }
+
         public string ToSql()
         {
             CheckAggregateUsage(false);

src/ServiceStack.OrmLite/SqlBuilder.cs

@@ -172,7 +172,7 @@ public string ResolveClauses(DynamicParameters p)
             }
         }
 
-        public class Template
+        public class Template : ISqlExpression
         {
             readonly string sql;
             readonly SqlBuilder builder;
@@ -214,6 +214,11 @@ void ResolveSql()
 
             public string RawSql { get { ResolveSql(); return rawSql; } }
             public object Parameters { get { ResolveSql(); return parameters; } }
+
+            public string ToSelectStatement()
+            {
+                return RawSql;
+            }
         }
 
         public Template AddTemplate(string sql, object parameters = null)

tests/ServiceStack.OrmLite.Tests/JoinSqlBuilderTests.cs

@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests
 {
@@ -86,5 +87,50 @@ public void DoubleWhereLeftJoinTest ()
             var stmt = OrmLiteConfig.DialectProvider.ToSelectStatement(typeof(User), joinQuery);
             Assert.That(Regex.Matches(stmt, @"(\b|\n)FROM(\b|\n)", RegexOptions.IgnoreCase).Count, Is.EqualTo(1));
         }
+
+	    [Test]
+	    public void Can_execute_JoinSqlBuilder_as_SqlExpression()
+	    {
+            var joinQuery = new JoinSqlBuilder<User, User>()
+                .LeftJoin<User, WithAliasAddress>(x => x.Id, x => x.UserId
+                    , sourceWhere: x => x.Age > 18
+                    , destinationWhere: x => x.Country == "Italy");
+
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<User>();
+                db.DropAndCreateTable<WithAliasAddress>();
+
+                var userId = db.Insert(new User { Age = 27, Name = "Foo" }, selectIdentity:true);
+                db.Insert(new WithAliasAddress { City = "Rome", Country = "Italy", UserId = (int)userId });
+
+                var results = db.Select<User>(joinQuery);
+                Assert.That(results.Count, Is.EqualTo(1));
+            }
+	    }
+
+	    [Test]
+	    public void Can_execute_SqlBuilder_templates_as_SqlExpression()
+	    {
+	        var sb = new SqlBuilder();
+
+            var tmpl = sb.AddTemplate("SELECT * FROM User u INNER JOIN Addresses a on a.UserId = u.Id /**where**/");
+            sb.Where("Age > @age", new { age = 18 });
+            sb.Where("Countryalias = @country", new { country = "Italy" });
+
+
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<User>();
+                db.DropAndCreateTable<WithAliasAddress>();
+
+                var userId = db.Insert(new User { Age = 27, Name = "Foo" }, selectIdentity: true);
+                db.Insert(new WithAliasAddress { City = "Rome", Country = "Italy", UserId = (int)userId });
+
+                var results = db.Select<User>(tmpl, tmpl.Parameters);
+
+                Assert.That(results.Count, Is.EqualTo(1));
+            }
+	    }
     }
 }