Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite

Author: mythz

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

@@ -166,7 +166,7 @@ public SqlExpression<T> CustomJoin(string joinString)
             return this;
         }
 
-        private SqlExpression<T> InternalJoin(string joinType, Expression joinExpr, ModelDefinition sourceDef, ModelDefinition targetDef, JoinFormatDelegate joinFormat = null)
+        protected virtual SqlExpression<T> InternalJoin(string joinType, Expression joinExpr, ModelDefinition sourceDef, ModelDefinition targetDef, JoinFormatDelegate joinFormat = null)
         {
             PrefixFieldWithTableName = true;
 
@@ -203,6 +203,8 @@ public string SelectInto<TModel>()
                 return ToSelectStatement();
             }
 
+            useFieldName = true;
+
             var sbSelect = StringBuilderCache.Allocate();
             var selectDef = modelDef;
             var orderedDefs = tableDefs;
@@ -239,7 +241,7 @@ public string SelectInto<TModel>()
 
                                 if (fieldDef.CustomSelect == null)
                                 {
-                                    sbSelect.Append($"{DialectProvider.GetQuotedColumnName(tableDef, matchingField)} AS {SqlColumn(fieldDef.Name)}");
+                                    sbSelect.Append($"{GetQuotedColumnName(tableDef, matchingField.Name)} AS {SqlColumn(fieldDef.Name)}");
                                 }
                                 else
                                 {
@@ -266,7 +268,7 @@ public string SelectInto<TModel>()
 
                             if (fieldDef.CustomSelect == null)
                             {
-                                sbSelect.Append($"{SqlTable(tableDef)}.{tableFieldDef.GetQuotedName(DialectProvider)}");
+                                sbSelect.Append($"{GetQuotedColumnName(tableDef, tableFieldDef.Name)}");
 
                                 if (tableFieldDef.Alias != null)
                                     sbSelect.Append(" AS ").Append(SqlColumn(fieldDef.Name));

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -2154,33 +2154,33 @@ protected virtual object VisitSqlMethodCall(MethodCallExpression m)
 
             switch (m.Method.Name)
             {
-                case "In":
+                case nameof(Sql.In):
                     statement = ConvertInExpressionToSql(m, quotedColName);
                     break;
-                case "Desc":
+                case nameof(Sql.Desc):
                     statement = $"{quotedColName} DESC";
                     break;
-                case "As":
+                case nameof(Sql.As):
                     statement = $"{quotedColName} AS {DialectProvider.GetQuotedColumnName(RemoveQuoteFromAlias(args[0].ToString()))}";
                     break;
-                case "Sum":
-                case "Count":
-                case "Min":
-                case "Max":
-                case "Avg":
+                case nameof(Sql.Sum):
+                case nameof(Sql.Count):
+                case nameof(Sql.Min):
+                case nameof(Sql.Max):
+                case nameof(Sql.Avg):
                     statement = $"{m.Method.Name}({quotedColName}{(args.Count == 1 ? $",{args[0]}" : "")})";
                     break;
-                case "CountDistinct":
+                case nameof(Sql.CountDistinct):
                     statement = $"COUNT(DISTINCT {quotedColName})";
                     break;
-                case "AllFields":
+                case nameof(Sql.AllFields):
                     var argDef = m.Arguments[0].Type.GetModelMetadata();
                     statement = DialectProvider.GetQuotedTableName(argDef) + ".*";
                     break;
-                case "JoinAlias":
+                case nameof(Sql.JoinAlias):
                     statement = args[0] + "." + quotedColName.ToString().LastRightPart('.');
                     break;
-                case "Custom":
+                case nameof(Sql.Custom):
                     statement = quotedColName.ToString();
                     break;
                 default: