Add fallback in Save/Load references to look at code conventions when matching aliases were not found

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

@@ -842,7 +842,8 @@ public static void LoadReferences<T>(this IDbCommand dbCmd, T instance)
         private static FieldDefinition GetRefFieldDef(ModelDefinition modelDef, ModelDefinition refModelDef, Type refType)
         {
             var refNameConvention = modelDef.ModelName + "Id";
-            var refField = refModelDef.FieldDefinitions.FirstOrDefault(x => x.FieldName == refNameConvention);
+            var refField = refModelDef.FieldDefinitions.FirstOrDefault(x => x.FieldName == refNameConvention)
+                ?? refModelDef.FieldDefinitions.FirstOrDefault(x => x.Name == modelDef.Name + "Id");
             if (refField == null)
                 throw new ArgumentException("Cant find '{0}' Property on Type '{1}'".Fmt(refNameConvention, refType.Name));
             return refField;

tests/ServiceStack.OrmLite.Tests/LoadReferencesTests.cs

@@ -105,6 +105,31 @@ public class OldAliasedCustomerAddress
         public string Country { get; set; }
     }
 
+    [Alias("FooCustomer")]
+    public class MismatchAliasCustomer
+    {
+        [AutoIncrement]
+        public int Id { get; set; }
+        public string Name { get; set; }
+
+        [Reference]
+        public MismatchAliasAddress PrimaryAddress { get; set; }
+    }
+
+    [Alias("BarCustomerAddress")]
+    public class MismatchAliasAddress
+    {
+        [AutoIncrement]
+        public int Id { get; set; }
+        [Alias("BarCustomerId")]
+        public int MismatchAliasCustomerId { get; set; }
+        public string AddressLine1 { get; set; }
+        public string AddressLine2 { get; set; }
+        public string City { get; set; }
+        public string State { get; set; }
+        public string Country { get; set; }
+    }
+
     public class LoadReferencesTests 
         : OrmLiteTestBase
     {
@@ -122,6 +147,8 @@ public class LoadReferencesTests
             db.DropAndCreateTable<AliasedCustomerAddress>();
             db.DropAndCreateTable<OldAliasedCustomer>();
             db.DropAndCreateTable<OldAliasedCustomerAddress>();
+            db.DropAndCreateTable<MismatchAliasCustomer>();
+            db.DropAndCreateTable<MismatchAliasAddress>();
         }
 
         [TestFixtureTearDown]
@@ -236,6 +263,36 @@ public void Can_Save_and_Load_Old_Aliased_References()
             Assert.That(dbCustomer.PrimaryAddress, Is.Not.Null);
         }
 
+        [Test]
+        public void Can_Save_and_Load_MismatchedAlias_References_using_code_conventions()
+        {
+            var customer = new MismatchAliasCustomer
+            {
+                Name = "Customer 1",
+                PrimaryAddress = new MismatchAliasAddress
+                {
+                    AddressLine1 = "1 Humpty Street",
+                    City = "Humpty Doo",
+                    State = "Northern Territory",
+                    Country = "Australia"
+                },
+            };
+
+            db.Save(customer);
+
+            Assert.That(customer.Id, Is.GreaterThan(0));
+            Assert.That(customer.PrimaryAddress.MismatchAliasCustomerId, Is.EqualTo(0));
+
+            db.SaveReferences(customer, customer.PrimaryAddress);
+            Assert.That(customer.PrimaryAddress.MismatchAliasCustomerId, Is.EqualTo(customer.Id));
+
+            var dbCustomer = db.LoadSingleById<MismatchAliasCustomer>(customer.Id);
+
+            dbCustomer.PrintDump();
+
+            Assert.That(dbCustomer.PrimaryAddress, Is.Not.Null);
+        }
+
         [Test] 
         public void Can_SaveAllReferences_then_Load_them()
         {