Use correct alias in joins

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -869,17 +869,12 @@ protected virtual object VisitMemberAccess(MemberExpression m)
                     }
                 }
 
+                var tableDef = modelType.GetModelDefinition();
                 if (propertyInfo.PropertyType.IsEnum)
                     return new EnumMemberAccess(
-                        (PrefixFieldWithTableName
-                            ? DialectProvider.GetQuotedTableName(modelType.GetModelDefinition().ModelName) + "." 
-                            : "") 
-                            + GetQuotedColumnName(m.Member.Name), propertyInfo.PropertyType);
-
-                return new PartialSqlString((PrefixFieldWithTableName
-                    ? DialectProvider.GetQuotedTableName(modelType.GetModelDefinition().ModelName) + "." 
-                    : "") 
-                    + GetQuotedColumnName(m.Member.Name));
+                        GetQuotedColumnName(tableDef, m.Member.Name), propertyInfo.PropertyType);
+
+                return new PartialSqlString(GetQuotedColumnName(tableDef, m.Member.Name));
             }
 
             var member = Expression.Convert(m, typeof(object));
@@ -1064,15 +1059,18 @@ protected virtual string BindOperant(ExpressionType e)
             }
         }
 
-        protected virtual string GetQuotedColumnName(string memberName)
+        protected virtual string GetQuotedColumnName(ModelDefinition tableDef, string memberName)
         {
             if (useFieldName)
             {
-                var fd = modelDef.FieldDefinitions.FirstOrDefault(x => x.Name == memberName);
-                var fn = fd != null 
+                var fd = tableDef.FieldDefinitions.FirstOrDefault(x => x.Name == memberName);
+                var fieldName = fd != null 
                     ? fd.FieldName 
                     : memberName;
-                return DialectProvider.GetQuotedColumnName(fn);
+
+                return PrefixFieldWithTableName 
+                    ? DialectProvider.GetQuotedColumnName(tableDef.ModelName, fieldName)
+                    : DialectProvider.GetQuotedColumnName(fieldName);
             }
             return memberName;
         }

src/ServiceStack.OrmLite/OrmLiteDialectProviderExtensions.cs

@@ -33,12 +33,20 @@ public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect,
             return dialect.GetQuotedColumnName(fieldDef.FieldName);
         }
 
-        public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect, 
+        public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect,
             ModelDefinition modelDef, FieldDefinition fieldDef)
         {
             return dialect.GetQuotedTableName(modelDef.ModelName) +
                 "." +
                 dialect.GetQuotedColumnName(fieldDef.FieldName);
         }
+
+        public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect,
+            string tableName, string fieldName)
+        {
+            return dialect.GetQuotedTableName(tableName) +
+                "." +
+                dialect.GetQuotedColumnName(fieldName);
+        }
     }
 }