Select best matching reference field for foreign key annotated fields

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs

@@ -863,9 +863,12 @@ public static FieldDefinition GetRefFieldDef(this ModelDefinition modelDef, Mode
 
         public static FieldDefinition GetRefFieldDefIfExists(this ModelDefinition modelDef, ModelDefinition refModelDef)
         {
-            var refField = refModelDef.FieldDefinitions.FirstOrDefault(x => x.ForeignKey != null && x.ForeignKey.ReferenceType == modelDef.ModelType)
-                           ?? refModelDef.FieldDefinitions.FirstOrDefault(x => x.FieldName == modelDef.ModelName + "Id")
-                           ?? refModelDef.FieldDefinitions.FirstOrDefault(x => x.Name == modelDef.Name + "Id");
+            var refField = 
+                   refModelDef.FieldDefinitions.FirstOrDefault(x => x.ForeignKey != null && x.ForeignKey.ReferenceType == modelDef.ModelType 
+                     && (x.FieldName == modelDef.ModelName + "Id" || x.Name == modelDef.Name + "Id"))
+                ?? refModelDef.FieldDefinitions.FirstOrDefault(x => x.ForeignKey != null && x.ForeignKey.ReferenceType == modelDef.ModelType)
+                ?? refModelDef.FieldDefinitions.FirstOrDefault(x => x.FieldName == modelDef.ModelName + "Id")
+                ?? refModelDef.FieldDefinitions.FirstOrDefault(x => x.Name == modelDef.Name + "Id");
             return refField;
         }
 

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

@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    public class Goal
+    {
+        [PrimaryKey]
+        public long Id { get; set; }
+
+        [Reference]
+        public List<Item> Items { get; set; }
+    }
+
+    public class Item
+    {
+        [PrimaryKey]
+        public long Id { get; set; }
+
+        [ForeignKey(typeof(Goal))]
+        public long AnyGoalId { get; set; }
+
+        [Alias("CorrectGoalId")]
+        [ForeignKey(typeof(Goal))]
+        public long GoalId { get; set; }
+    }
+
+    [TestFixture]
+    public class MultiFieldReferenceTests
+        : OrmLiteTestBase
+    {
+        [Test]
+        public void Does_select_correct_reference_field()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropTable<Item>();
+                db.DropTable<Goal>();
+                db.CreateTable<Goal>();
+                db.CreateTable<Item>();
+
+                var goal = new Goal { Id = 1 };
+                db.Save(goal, references: true);
+
+                var goalWithItems = new Goal
+                {
+                    Id = 2,
+                    Items = new List<Item>
+                    {
+                        new Item { Id = 10, AnyGoalId = 1 },
+                        new Item { Id = 11, AnyGoalId = 1 },
+                    }
+                };
+
+                db.Save(goalWithItems, references: true);
+
+                Assert.That(goalWithItems.Items[0].GoalId, Is.EqualTo(goalWithItems.Id));
+                Assert.That(goalWithItems.Items[1].GoalId, Is.EqualTo(goalWithItems.Id));
+
+                var dbGoals = db.LoadSelect<Goal>(x => x.Id == goalWithItems.Id).First();
+                db.GetLastSql().Print();
+
+                Assert.That(dbGoals.Items[0].GoalId, Is.EqualTo(goalWithItems.Id));
+                Assert.That(dbGoals.Items[1].GoalId, Is.EqualTo(goalWithItems.Id));
+            }
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -130,6 +130,7 @@
     <Compile Include="Expression\SelectExpressionTests.cs" />
     <Compile Include="Issues\ComplexJoinWithAlias.cs" />
     <Compile Include="Issues\MismatchSchemaTests.cs" />
+    <Compile Include="Issues\MultiFieldReferenceTests.cs" />
     <Compile Include="Issues\MultithreadingIssueTests.cs" />
     <Compile Include="Issues\SchemaTests.cs" />
     <Compile Include="Issues\SelectDistinctTests.cs" />