Change FindColumnIndex to use NamingStrategy when finding columns

Author: mythz

src/ServiceStack.OrmLite/OrmLiteUtils.cs

@@ -394,22 +394,28 @@ public static Tuple<FieldDefinition, int, IOrmLiteConverter>[] GetIndexFieldsCac
         private const int NotFound = -1;
         internal static int FindColumnIndex(IOrmLiteDialectProvider dialectProvider, FieldDefinition fieldDef, Dictionary<string, int> dbFieldMap)
         {
-            var index = NotFound;
-            if (!dbFieldMap.TryGetValue(fieldDef.FieldName, out index))
-            {
-                index = TryGuessColumnIndex(fieldDef.FieldName, dbFieldMap);
-            }
+            int index;
+            var fieldName = dialectProvider.NamingStrategy.GetColumnName(fieldDef.FieldName);
+            if (dbFieldMap.TryGetValue(fieldName, out index))
+                return index;
+
+            index = TryGuessColumnIndex(fieldName, dbFieldMap);
+            if (index != NotFound)
+                return index;
 
             // Try fallback to original field name when overriden by alias
-            if (index == NotFound && fieldDef.Alias != null && !OrmLiteConfig.DisableColumnGuessFallback)
+            if (fieldDef.Alias != null && !OrmLiteConfig.DisableColumnGuessFallback)
             {
-                if (!dbFieldMap.TryGetValue(fieldDef.Name, out index))
-                {
-                    index = TryGuessColumnIndex(fieldDef.Name, dbFieldMap);
-                }
+                var alias = dialectProvider.NamingStrategy.GetColumnName(fieldDef.Name);
+                if (dbFieldMap.TryGetValue(alias, out index))
+                    return index;
+
+                index = TryGuessColumnIndex(alias, dbFieldMap);
+                if (index != NotFound)
+                    return index;
             }
 
-            return index;
+            return NotFound;
         }
 
         private static readonly Regex AllowedPropertyCharsRegex = new Regex(@"[^0-9a-zA-Z_]",

tests/ServiceStack.OrmLite.Tests/Expression/ComplexJoinTests.cs

@@ -248,8 +248,6 @@ public void ComplexJoin_with_SqlExpression()
                 Assert.That(fooBarBaz.BazId, Is.EqualTo(_baz2Id));
                 fooBarBaz = results.First(x => x.FooBarBazId == _fooBarBaz2Id);
                 Assert.That(fooBarBaz.BazId, Is.EqualTo(_baz1Id));
-                fooBarBaz = results.First(x => x.FooBarBazId == _fooBarBaz2Id);
-                Assert.That(fooBarBaz.BazId, Is.EqualTo(_baz1Id));
             }
         }