Expand fallback for JOIN selects to be able to reference any {Table}{Field} property convention

Author: mythz

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 
@@ -154,22 +155,23 @@ public string SelectInto<TModel>()
 
                 if (!found)
                 {
-                    // Add support for auto mapping `{Table}Id` convention
+                    // Add support for auto mapping `{Table}{Field}` convention
                     foreach (var tableDef in tableDefs)
                     {
-                        var primaryKey = tableDef.PrimaryKey;
-                        if (primaryKey == null) continue;
-                        
-                        var tableId = tableDef.Name + primaryKey.Name;
-                        if (fieldDef.Name == tableId)
+                        var tableName = tableDef.Name;
+                        var matchingField = tableDef.FieldDefinitionsArray
+                            .FirstOrDefault(x => tableName + x.FieldName == fieldDef.Name);
+
+                        if (matchingField != null)
                         {
                             if (sbSelect.Length > 0)
                                 sbSelect.Append(", ");
 
                             sbSelect.AppendFormat("{0}.{1} as {2}",
                                 SqlTable(tableDef.ModelName),
-                                primaryKey.GetQuotedName(DialectProvider),
+                                matchingField.GetQuotedName(DialectProvider),
                                 fieldDef.Name);
+                            
                             break;
                         }
                     }

tests/ServiceStack.OrmLite.Tests/LoadReferencesJoinTests.cs

@@ -64,12 +64,14 @@ public class FullCustomerInfo
         {
             public int Id { get; set; }
             public string Name { get; set; }
+            public string CustomerName { get; set; }
             public int CustomerAddressId { get; set; }
             public string AddressLine1 { get; set; }
             public string City { get; set; }
             public int OrderId { get; set; }
             public string LineItem { get; set; }
             public decimal Cost { get; set; }
+            public decimal OrderCost { get; set; }
             public string CountryCode { get; set; }
         }
 
@@ -366,7 +368,7 @@ public void Can_Join_on_matching_Alias_convention()
         }
 
         [Test]
-        public void Does_populate_PrimaryKey_ids_based_on_property_convention()
+        public void Does_populate_custom_columns_based_on_property_convention()
         {
             // Reset auto ids
             db.DropAndCreateTable<Order>();
@@ -385,6 +387,12 @@ public void Does_populate_PrimaryKey_ids_based_on_property_convention()
             var orderIds = results.ConvertAll(x => x.OrderId);
             Assert.That(orderIds, Is.EquivalentTo(new[] { 1, 2 }));
 
+            var customerNames = results.ConvertAll(x => x.CustomerName);
+            Assert.That(customerNames, Is.EquivalentTo(new[] { "Customer 1", "Customer 1" }));
+
+            var orderCosts = results.ConvertAll(x => x.OrderCost);
+            Assert.That(orderCosts, Is.EquivalentTo(new[] { 1.99m, 2.99m }));
+
             var expr = db.From<Customer>()
                 .Join<Customer, CustomerAddress>()
                 .Join<Customer, Order>()
@@ -397,6 +405,12 @@ public void Does_populate_PrimaryKey_ids_based_on_property_convention()
 
             orderIds = results.ConvertAll(x => x.OrderId);
             Assert.That(orderIds, Is.EquivalentTo(new[] { 2 }));
+
+            customerNames = results.ConvertAll(x => x.CustomerName);
+            Assert.That(customerNames, Is.EquivalentTo(new[] { "Customer 1" }));
+
+            orderCosts = results.ConvertAll(x => x.OrderCost);
+            Assert.That(orderCosts, Is.EquivalentTo(new[] { 2.99m }));
         }
     }
 }