Add new multiple select tests

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -124,6 +124,22 @@ public virtual SqlExpression<T> Select<TKey>(Expression<Func<T, TKey>> fields)
             return this;
         }
 
+        public virtual SqlExpression<T> Select<Table1, Table2>(Expression<Func<Table1, Table2, object>> fields)
+        {
+            sep = string.Empty;
+            useFieldName = true;
+            BuildSelectExpression(Visit(fields).ToString(), false);
+            return this;
+        }
+
+        public virtual SqlExpression<T> Select<Table1, Table2, Table3>(Expression<Func<Table1, Table2, Table3, object>> fields)
+        {
+            sep = string.Empty;
+            useFieldName = true;
+            BuildSelectExpression(Visit(fields).ToString(), false);
+            return this;
+        }
+
         public virtual SqlExpression<T> SelectDistinct<TKey>(Expression<Func<T, TKey>> fields)
         {
             sep = string.Empty;
@@ -132,6 +148,22 @@ public virtual SqlExpression<T> SelectDistinct<TKey>(Expression<Func<T, TKey>> f
             return this;
         }
 
+        public virtual SqlExpression<T> SelectDistinct<Table1, Table2>(Expression<Func<Table1, Table2, object>> fields)
+        {
+            sep = string.Empty;
+            useFieldName = true;
+            BuildSelectExpression(Visit(fields).ToString(), true);
+            return this;
+        }
+
+        public virtual SqlExpression<T> SelectDistinct<Table1, Table2, Table3>(Expression<Func<Table1, Table2, Table3, object>> fields)
+        {
+            sep = string.Empty;
+            useFieldName = true;
+            BuildSelectExpression(Visit(fields).ToString(), true);
+            return this;
+        }
+
         public virtual SqlExpression<T> SelectDistinct()
         {
             selectDistinct = true;

tests/ServiceStack.OrmLite.Tests/Expression/ComplexJoinTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using NUnit.Framework;
@@ -154,13 +155,13 @@ private static void InitTables(IDbConnection db)
             db.Insert(new BarJoin { Id = bar1Id, Name = "Banana", });
             db.Insert(new BarJoin { Id = bar2Id, Name = "Orange", });
 
-            _baz1Id = (int) db.Insert(new Baz {Name = "Large"}, true);
-            _baz2Id = (int) db.Insert(new Baz {Name = "Huge"}, true);
+            _baz1Id = (int)db.Insert(new Baz { Name = "Large" }, true);
+            _baz2Id = (int)db.Insert(new Baz { Name = "Huge" }, true);
 
-            _fooBar1Id = (int) db.Insert(new FooBar { BarId = bar1Id, }, true);
-            _fooBar2Id = (int) db.Insert(new FooBar { BarId = bar2Id, }, true);
+            _fooBar1Id = (int)db.Insert(new FooBar { BarId = bar1Id, }, true);
+            _fooBar2Id = (int)db.Insert(new FooBar { BarId = bar2Id, }, true);
 
-            _fooBarBaz1Id = (int) db.Insert(new FooBarBaz { Amount = 42, FooBarId = _fooBar1Id, BazId = _baz2Id }, true);
+            _fooBarBaz1Id = (int)db.Insert(new FooBarBaz { Amount = 42, FooBarId = _fooBar1Id, BazId = _baz2Id }, true);
             _fooBarBaz2Id = (int)db.Insert(new FooBarBaz { Amount = 50, FooBarId = _fooBar1Id, BazId = _baz1Id }, true);
             _fooBarBaz3Id = (int)db.Insert(new FooBarBaz { Amount = 2, FooBarId = _fooBar2Id, BazId = _baz1Id }, true);
         }
@@ -181,7 +182,7 @@ public void Can_query_contains_on_joined_table_column()
 
                 q = db.From<FooBar>()
                     .Join<BarJoin>((dp, p) => dp.BarId == p.Id)
-                    .Where<FooBar, BarJoin>((f,x) => x.Name.Contains("an"));
+                    .Where<FooBar, BarJoin>((f, x) => x.Name.Contains("an"));
 
                 results = db.Select<JoinResult>(q);
                 Assert.That(results.Count, Is.EqualTo(2));
@@ -252,6 +253,31 @@ public void ComplexJoin_with_SqlExpression()
             }
         }
 
+        [Test]
+        public void Can_select_dictionary_from_multiple_tables()
+        {
+            using (var db = OpenDbConnection())
+            {
+                InitTables(db);
+
+                var q = db.From<FooBar>()
+                    .Join<BarJoin>()
+                    .Select<FooBar, BarJoin>((f, b) => new { f.Id, b.Name });
+
+                var results = db.Dictionary<int, string>(q);
+
+                var sql = db.GetLastSql();
+                sql.Print();
+
+                results.PrintDump();
+
+                Assert.That(results, Is.EquivalentTo(new Dictionary<int, string> {
+                    {1,"Banana"},
+                    {2,"Orange"},
+                }));
+            }
+        }
+
         [Test]
         public void Can_limit_ComplexJoin_query()
         {