Fix RowVersion and Field Mapping tests for PostgreSql

Author: mythz

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -122,6 +122,9 @@ public override string GetColumnDefinition(
             return sql.ToString();
         }
 
+        //Convert xmin into an integer so it can be used in comparisons
+        public const string RowVersionFieldComparer = "int8in(xidout(xmin))";
+
         public override string GetRowVersionColumnName(FieldDefinition field)
         {
             return "xmin as " + GetQuotedColumnName(field.FieldName);
@@ -130,7 +133,7 @@ public override string GetRowVersionColumnName(FieldDefinition field)
         public override void AppendFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef, IDbCommand cmd)
         {
             var columnName = fieldDef.IsRowVersion
-                ? "int8in(xidout(xmin))" //Convert xmin into an integer so it can be used in comparisons
+                ? RowVersionFieldComparer
                 : GetQuotedColumnName(fieldDef.FieldName);
 
             sqlFilter

src/ServiceStack.OrmLite.PostgreSQL/PostgreSqlExpression.cs

@@ -1,8 +1,25 @@
+using System.Linq;
+
 namespace ServiceStack.OrmLite.PostgreSQL
 {
     public class PostgreSqlExpression<T> : SqlExpression<T>
     {
         public PostgreSqlExpression(IOrmLiteDialectProvider dialectProvider)
             : base(dialectProvider) {}
+
+        protected override string GetQuotedColumnName(ModelDefinition tableDef, string memberName)
+        {
+            if (useFieldName)
+            {
+                var fd = tableDef.FieldDefinitions.FirstOrDefault(x => x.Name == memberName);
+                if (fd != null && fd.IsRowVersion && !PrefixFieldWithTableName)
+                {
+                    return PostgreSQLDialectProvider.RowVersionFieldComparer;
+                }
+
+                return base.GetQuotedColumnName(tableDef, memberName);
+            }
+            return memberName;
+        }
     }
 }

src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs

@@ -168,7 +168,7 @@ public string SelectInto<TModel>()
                                 tableFieldDef.GetQuotedName(DialectProvider));
 
                             if (tableFieldDef.Alias != null)
-                                sbSelect.Append(" AS ").Append(fieldDef.Name);
+                                sbSelect.Append(" AS ").Append(DialectProvider.NamingStrategy.GetColumnName(fieldDef.Name));
 
                             break;
                         }

src/ServiceStack.OrmLite/OrmLiteWriteExtensions.cs

@@ -267,6 +267,27 @@ public static int GetColumnIndex(this IDataReader dataReader, string fieldName)
             }
         }
 
+        private static int FindColumnIndex(IDataReader dataReader, FieldDefinition fieldDef)
+        {
+            var index = NotFound;
+            index = dataReader.GetColumnIndex(fieldDef.FieldName);
+            if (index == NotFound)
+            {
+                index = TryGuessColumnIndex(fieldDef.FieldName, dataReader);
+            }
+            // Try fallback to original field name when overriden by alias
+            if (index == NotFound && fieldDef.Alias != null && !OrmLiteConfig.DisableColumnGuessFallback)
+            {
+                index = dataReader.GetColumnIndex(fieldDef.Name);
+                if (index == NotFound)
+                {
+                    index = TryGuessColumnIndex(fieldDef.Name, dataReader);
+                }
+            }
+
+            return index;
+        }
+
         private const int NotFound = -1;
         public static T PopulateWithSqlReader<T>(this T objWithProperties, IDataReader dataReader, FieldDefinition[] fieldDefs, Dictionary<string, int> indexCache)
         {
@@ -281,22 +302,14 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties, IDataReader d
                     {
                         if (!indexCache.TryGetValue(fieldDef.Name, out index))
                         {
-                            index = dataReader.GetColumnIndex(fieldDef.FieldName);
-                            if (index == NotFound)
-                            {
-                                index = TryGuessColumnIndex(fieldDef.FieldName, dataReader);
-                            }
+                            index = FindColumnIndex(dataReader, fieldDef);
 
                             indexCache.Add(fieldDef.Name, index);
                         }
                     }
                     else
                     {
-                        index = dataReader.GetColumnIndex(fieldDef.FieldName);
-                        if (index == NotFound)
-                        {
-                            index = TryGuessColumnIndex(fieldDef.FieldName, dataReader);
-                        }
+                        index = FindColumnIndex(dataReader, fieldDef);
                     }
 
                     dialectProvider.SetDbValue(fieldDef, dataReader, index, objWithProperties);