Fix issue mapping to alias having same name as alternative field

Author: mythz

src/ServiceStack.OrmLite/ModelDefinition.cs

@@ -79,6 +79,12 @@ public FieldDefinition[] FieldDefinitionsArray
             get { return fieldDefinitionsArray; }
         }
 
+        private FieldDefinition[] fieldDefinitionsWithAliases;
+        public FieldDefinition[] FieldDefinitionsWithAliases
+        {
+            get { return fieldDefinitionsWithAliases; }
+        }
+
         public List<FieldDefinition> IgnoredFieldDefinitions { get; set; }
 
         private FieldDefinition[] ignoredFieldDefinitionsArray;
@@ -125,14 +131,24 @@ public FieldDefinition GetFieldDefinition(string fieldName)
         {
             if (fieldName != null)
             {
+                foreach (var f in FieldDefinitionsWithAliases)
+                {
+                    if (f.Alias == fieldName)
+                        return f;
+                }
                 foreach (var f in FieldDefinitionsArray)
                 {
-                    if (f.Name == fieldName)
+                    if (f.FieldName == fieldName)
+                        return f;
+                }
+                foreach (var f in FieldDefinitionsWithAliases)
+                {
+                    if (string.Equals(f.Alias, fieldName, StringComparison.OrdinalIgnoreCase))
                         return f;
                 }
                 foreach (var f in FieldDefinitionsArray)
                 {
-                    if (string.Equals(f.Name, fieldName, StringComparison.OrdinalIgnoreCase))
+                    if (string.Equals(f.FieldName, fieldName, StringComparison.OrdinalIgnoreCase))
                         return f;
                 }
             }
@@ -142,6 +158,8 @@ public FieldDefinition GetFieldDefinition(string fieldName)
         public void AfterInit()
         {
             fieldDefinitionsArray = FieldDefinitions.ToArray();
+            fieldDefinitionsWithAliases = FieldDefinitions.Where(x => x.Alias != null).ToArray();
+
             ignoredFieldDefinitionsArray = IgnoredFieldDefinitions.ToArray();
 
             var allItems = new List<FieldDefinition>(FieldDefinitions);

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

@@ -0,0 +1,42 @@
+using System.Linq;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    public class AddressAudit
+    {
+        [PrimaryKey, AutoIncrement]
+        [Alias("AddressId")]
+        public int Id { get; set; }
+
+        [Alias("AddressLinkId")]
+        public int AddressId { get; set; }
+    }
+
+    [TestFixture]
+    public class SelectAliasIssue : OrmLiteTestBase
+    {
+        [Test]
+        public void Does_populate_table_with_Aliases_having_same_name_as_alternative_field()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<AddressAudit>();
+
+                db.Insert(new AddressAudit { AddressId = 11 });
+                db.Insert(new AddressAudit { AddressId = 12 });
+                db.Insert(new AddressAudit { AddressId = 13 });
+
+                var rows = db.Select<AddressAudit>();
+                Assert.That(rows.All(x => x.Id > 0));
+
+                var debtor = db.SingleById<AddressAudit>(2);
+                var row = db.Single<AddressAudit>(audit => audit.AddressId == debtor.AddressId);
+
+                row.PrintDump();
+            }
+        }
+    }
+}

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

@@ -131,6 +131,7 @@
     <Compile Include="Issues\BelongsToIssue.cs" />
     <Compile Include="Issues\CanBuildExpressionWithAbstractType.cs" />
     <Compile Include="Issues\ColumnGuessingTests.cs" />
+    <Compile Include="Issues\SelectAliasIssue.cs" />
     <Compile Include="Issues\SimpleInsertSelectBenchmark.cs" />
     <Compile Include="Issues\JoinBoolSqlServerIssue.cs" />
     <Compile Include="Issues\LoadReferencesFKandSelfRefIssue.cs" />