Don't try to select unmatched columns, allows re-use and partial population of same model

Author: mythz

src/ServiceStack.OrmLite/Expressions/ReadConnectionExtensions.cs

@@ -46,7 +46,7 @@ public static SqlExpression<T> From<T>(this IDbConnection dbConn)
         public static SqlExpression<T> From<T, JoinWith>(this IDbConnection dbConn, Expression<Func<T, JoinWith, bool>> joinExpr=null)
         {
             var sql = OrmLiteConfig.ExecFilter.SqlExpression<T>(dbConn);
-            sql.Join(joinExpr);
+            sql.Join<T,JoinWith>(joinExpr);
             return sql;
         }
 

src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs

@@ -9,6 +9,11 @@ public abstract partial class SqlExpression<T> : ISqlExpression
     {
         List<ModelDefinition> tableDefs = new List<ModelDefinition>();
 
+        public SqlExpression<T> Join<Target>(Expression<Func<T, Target, bool>> joinExpr = null)
+        {
+            return InternalJoin("INNER JOIN", joinExpr);
+        }
+
         public SqlExpression<T> Join<Source, Target>(Expression<Func<Source, Target, bool>> joinExpr = null)
         {
             return InternalJoin("INNER JOIN", joinExpr);
@@ -124,16 +129,6 @@ public string SelectInto<TModel>()
                     if (found)
                         break;
                 }
-
-                if (!found)
-                {
-                    if (sbSelect.Length > 0)
-                        sbSelect.Append(", ");
-
-                    sbSelect.AppendFormat("{0}.{1}",
-                        modelDef.ModelName.SqlTable(),
-                        fieldDef.GetQuotedName());
-                }
             }
 
             SelectExpression = "SELECT " + sbSelect;

tests/ServiceStack.OrmLite.Tests/LoadReferencesTests.cs

@@ -50,6 +50,14 @@ public class Order
         public decimal Cost { get; set; }
     }
 
+    public class Country
+    {
+        [AutoIncrement]
+        public int Id { get; set; }
+        public string CountryName { get; set; }
+        public string CountryCode { get; set; }
+    }
+
     /// <summary>
     /// Test POCOs using table aliases and an alias on the foreign key reference
     /// </summary>
@@ -143,6 +151,7 @@ public class LoadReferencesTests
             db.DropAndCreateTable<Order>();
             db.DropAndCreateTable<Customer>();
             db.DropAndCreateTable<CustomerAddress>();
+            db.DropAndCreateTable<Country>();
             db.DropAndCreateTable<AliasedCustomer>();
             db.DropAndCreateTable<AliasedCustomerAddress>();
             db.DropAndCreateTable<OldAliasedCustomer>();
@@ -366,6 +375,7 @@ public class CustomerJoin
             public string City { get; set; }
             public string LineItem { get; set; }
             public decimal Cost { get; set; }
+            public string CountryCode { get; set; }
         }
 
         [Test]
@@ -461,7 +471,7 @@ public void Can_do_joins_with_complex_wheres_using_SqlExpression()
             };
 
             db.Save(customer1, references: true);
-            
+
             var customer2 = new Customer
             {
                 Name = "Customer 2",
@@ -480,6 +490,10 @@ public void Can_do_joins_with_complex_wheres_using_SqlExpression()
 
             db.Save(customer2, references: true);
 
+            db.Insert(
+                new Country { CountryName = "Australia", CountryCode = "AU" },
+                new Country { CountryName = "USA", CountryCode = "US" });
+
             var results = db.Select<CustomerJoin, Customer>(q => q
                 .Join<Customer, CustomerAddress>()
                 .Join<Customer, Order>()
@@ -496,12 +510,23 @@ public void Can_do_joins_with_complex_wheres_using_SqlExpression()
                 .Where(c => c.Name == "Customer 2")
                 .And<CustomerAddress, Order>((a, o) => a.Country == o.LineItem));
 
+            costs = results.ConvertAll(x => x.Cost);
+            Assert.That(costs, Is.EquivalentTo(new[] { 20m }));
+
+            var countryResults = db.Select<CustomerJoin>(db.From<Customer>()
+                .Join<Order>((c, o) => c.Id == o.CustomerId) //explicit join condition
+                .Join<CustomerAddress>()                     //implicit join with Customer
+                .Join<CustomerAddress,Country>((ca, c) => ca.Country == c.CountryName)
+                .Where(c => c.Name == "Customer 2")          //implicit condition with Customer
+                .And<CustomerAddress, Order>((a, o) => a.Country == o.LineItem));
+
             db.GetLastSql().Print();
 
-            costs = results.ConvertAll(x => x.Cost);
+            costs = countryResults.ConvertAll(x => x.Cost);
             Assert.That(costs, Is.EquivalentTo(new[] { 20m }));
+            Assert.That(countryResults.ConvertAll(x => x.CountryCode), Is.EquivalentTo(new[] { "US" }));
         }
-    
+
     }
 
 }