Merge pull request #566 from OlegNadymov/master

mythz · web-flow · commit 6175ee723da5 · 2017-02-16T10:27:29.000-05:00
Use GetQuotedColumnName inside SelectInto
diff --git a/src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs b/src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,8 @@ public string SelectInto<TModel>()`
`203`	`203`	`return ToSelectStatement();`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ useFieldName = true;`
	`207`	`+`
`206`	`208`	`var sbSelect = StringBuilderCache.Allocate();`
`207`	`209`	`var selectDef = modelDef;`
`208`	`210`	`var orderedDefs = tableDefs;`
`@@ -239,7 +241,7 @@ public string SelectInto<TModel>()`
`239`	`241`
`240`	`242`	`if (fieldDef.CustomSelect == null)`
`241`	`243`	`{`
`242`		`- sbSelect.Append($"{DialectProvider.GetQuotedColumnName(tableDef, matchingField)} AS {SqlColumn(fieldDef.Name)}");`
	`244`	`+ sbSelect.Append($"{GetQuotedColumnName(tableDef, matchingField.Name)} AS {SqlColumn(fieldDef.Name)}");`
`243`	`245`	`}`
`244`	`246`	`else`
`245`	`247`	`{`
`@@ -266,7 +268,7 @@ public string SelectInto<TModel>()`
`266`	`268`
`267`	`269`	`if (fieldDef.CustomSelect == null)`
`268`	`270`	`{`
`269`		`- sbSelect.Append($"{SqlTable(tableDef)}.{tableFieldDef.GetQuotedName(DialectProvider)}");`
	`271`	`+ sbSelect.Append($"{GetQuotedColumnName(tableDef, tableFieldDef.Name)}");`
`270`	`272`
`271`	`273`	`if (tableFieldDef.Alias != null)`
`272`	`274`	`sbSelect.Append(" AS ").Append(SqlColumn(fieldDef.Name));`