Fix self-reference test and impl for checking on FK value, not parent PK value

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

@@ -1011,8 +1011,8 @@ internal static List<Into> LoadListWithReferences<Into, From>(this IDbCommand db
                         foreach (var result in parentResults)
                         {
                             object childResult;
-                            var pkValue = modelDef.PrimaryKey.GetValue(result);
-                            if (map.TryGetValue(pkValue, out childResult))
+                            var fkValue = refSelf.GetValue(result);
+                            if (map.TryGetValue(fkValue, out childResult))
                             {
                                 fieldDef.SetValueFn(result, childResult);
                             }

tests/ServiceStack.OrmLite.Tests/LoadReferencesTests.cs

@@ -144,7 +144,7 @@ public class SelfCustomer
         public int Id { get; set; }
         public string Name { get; set; }
 
-        public int SelfCustomerAddressId { get; set; }
+        public int? SelfCustomerAddressId { get; set; }
 
         [Reference]
         public SelfCustomerAddress PrimaryAddress { get; set; }
@@ -434,13 +434,15 @@ public void Can_Save_and_Load_Self_References()
                 },
             };
 
+            db.Save(new SelfCustomer { Name = "Dummy Incrementer" });
+
             db.Save(customer);
 
             Assert.That(customer.Id, Is.GreaterThan(0));
             Assert.That(customer.SelfCustomerAddressId, Is.EqualTo(0));
 
             db.SaveReferences(customer, customer.PrimaryAddress);
-            Assert.That(customer.SelfCustomerAddressId, Is.EqualTo(customer.Id));
+            Assert.That(customer.SelfCustomerAddressId, Is.EqualTo(customer.PrimaryAddress.Id));
 
             var dbCustomer = db.LoadSingleById<SelfCustomer>(customer.Id);
             Assert.That(dbCustomer.PrimaryAddress, Is.Not.Null);
@@ -457,8 +459,8 @@ public void Can_Save_and_Load_Self_References()
                 },
             };
 
-            db.Save(customer, references:true);
-            Assert.That(customer.SelfCustomerAddressId, Is.EqualTo(customer.Id));
+            db.Save(customer, references: true);
+            Assert.That(customer.SelfCustomerAddressId, Is.EqualTo(customer.PrimaryAddress.Id));
 
             dbCustomer = db.LoadSingleById<SelfCustomer>(customer.Id);
             Assert.That(dbCustomer.PrimaryAddress, Is.Not.Null);
@@ -489,10 +491,12 @@ public void Can_load_list_of_self_references()
                 },
             };
 
-            customers.Each(x => 
-                db.Save(x, references:true));
+            db.Save(new SelfCustomer { Name = "Dummy Incrementer" });
+
+            customers.Each(x =>
+                db.Save(x, references: true));
 
-            var results = db.LoadSelect<SelfCustomer>();
+            var results = db.LoadSelect<SelfCustomer>(q => q.SelfCustomerAddressId != null);
             Assert.That(results.Count, Is.EqualTo(2));
             Assert.That(results.All(x => x.PrimaryAddress != null));