Change SetRefFieldAsync to match SetRefField behavior

Author: mythz

src/ServiceStack.OrmLite/Support/LoadList.cs

@@ -258,17 +258,17 @@ public async Task SetRefFieldAsync(FieldDefinition fieldDef, Type refType, Cance
                 ? modelDef.GetRefFieldDef(refModelDef, refType)
                 : modelDef.GetRefFieldDefIfExists(refModelDef);
 
-            if (refField != null)
+            if (refSelf != null)
             {
-                var sqlRef = GetRefFieldSql(refModelDef, refField);
+                var sqlRef = GetRefSelfSql(modelDef, refSelf, refModelDef);
                 var childResults = await dbCmd.ConvertToListAsync(refType, sqlRef, token);
-                SetRefFieldChildResults(fieldDef, refField, childResults);
+                SetRefSelfChildResults(fieldDef, refModelDef, refSelf, childResults);
             }
-            else if (refSelf != null)
+            else if (refField != null)
             {
-                var sqlRef = GetRefSelfSql(modelDef, refSelf, refModelDef);
+                var sqlRef = GetRefFieldSql(refModelDef, refField);
                 var childResults = await dbCmd.ConvertToListAsync(refType, sqlRef, token);
-                SetRefSelfChildResults(fieldDef, refModelDef, refSelf, childResults);
+                SetRefFieldChildResults(fieldDef, refField, childResults);
             }
         }
     }

tests/ServiceStack.OrmLite.Tests/Issues/LoadReferenceIssueWithCyclicalForeignKeys.cs

@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    [TestFixtureOrmLiteDialects(Dialect.Sqlite)]
+    public class LoadReferenceIssueWithCyclicalForeignKeys : OrmLiteProvidersTestBase
+    {
+        public LoadReferenceIssueWithCyclicalForeignKeys(DialectContext context) : base(context) { }
+
+        public class BaseEntity
+        {
+            [AutoIncrement]
+            [PrimaryKey]
+            public long Id { get; set; }
+        }
+
+        public class ResearchEntity : BaseEntity
+        {
+            [References(typeof(NameEntity))]
+            public long? PrimaryNameId { get; set; }
+
+            [Reference]
+            public NameEntity PrimaryName { get; set; }
+
+            [Reference]
+            public List<NameEntity> Names { get; set; } = new List<NameEntity>();
+        }
+
+        public class NameEntity : BaseEntity
+        {
+            public string Value { get; set; }
+
+            [References(typeof(ResearchEntity))]
+            public long ResearchId { get; set; }
+
+            [Reference]
+            public ResearchEntity Research { get; set; }
+        }
+
+        [Test]
+        public void Does_update_self_FK_Key_when_saving_references()
+        {
+            using var db = OpenDbConnection();
+            db.DropAndCreateTable<NameEntity>();
+            db.DropAndCreateTable<ResearchEntity>();
+
+            for (var i = 1; i <= 5; i++)
+            {
+                var research = new ResearchEntity();
+                research.Names.Add(new NameEntity {Value = $"test {1 + i}"});
+                research.Names.Add(new NameEntity {Value = $"test {2 + i}"});
+                research.Names.Add(new NameEntity {Value = $"test {3 + i}"});
+
+                db.Save(research, references: true);
+                research.PrimaryNameId = research.Names[1].Id;
+                db.Save(research);
+            }
+
+            OrmLiteUtils.PrintSql();
+            var res = db.LoadSelect(
+                    db.From<ResearchEntity>().Where(x => x.Id == 5))
+                .FirstNonDefault();
+            Assert.That(res.PrimaryName.Id, Is.EqualTo(res.PrimaryNameId));
+        }
+
+        [Test]
+        public async Task Does_update_self_FK_Key_when_saving_references_Async()
+        {
+            using var db = await OpenDbConnectionAsync();
+            db.DropAndCreateTable<NameEntity>();
+            db.DropAndCreateTable<ResearchEntity>();
+
+            for (var i = 1; i <= 5; i++)
+            {
+                var research = new ResearchEntity();
+                research.Names.Add(new NameEntity {Value = $"test {1 + i}"});
+                research.Names.Add(new NameEntity {Value = $"test {2 + i}"});
+                research.Names.Add(new NameEntity {Value = $"test {3 + i}"});
+
+                await db.SaveAsync(research, references: true);
+                research.PrimaryNameId = research.Names[1].Id;
+                await db.SaveAsync(research);
+            }
+
+            OrmLiteUtils.PrintSql();
+            var res = (await db.LoadSelectAsync(
+                    db.From<ResearchEntity>().Where(x => x.Id == 5)))
+                .FirstNonDefault();
+            Assert.That(res.PrimaryName.Id, Is.EqualTo(res.PrimaryNameId));
+        }
+    }
+}