@@ -137,6 +137,8 @@ public virtual SqlExpression<T> Select(string[] fields)
137
137
if ( fields == null || fields . Length == 0 )
138
138
return Select ( string . Empty ) ;
139
139
140
+ useFieldName = true ;
141
+
140
142
var allTableDefs = new List < ModelDefinition > { modelDef } ;
141
143
allTableDefs . AddRange ( tableDefs ) ;
142
144
@@ -155,7 +157,7 @@ public virtual SqlExpression<T> Select(string[] fields)
155
157
{
156
158
foreach ( var fieldDef in tableDef . FieldDefinitionsArray )
157
159
{
158
- var qualifiedField = DialectProvider . GetQuotedColumnName ( tableDef , fieldDef ) ;
160
+ var qualifiedField = GetQuotedColumnName ( tableDef , fieldDef . Name ) ;
159
161
160
162
if ( sb . Length > 0 )
161
163
sb . Append ( ", " ) ;
@@ -173,7 +175,7 @@ public virtual SqlExpression<T> Select(string[] fields)
173
175
if ( match == null )
174
176
continue ;
175
177
176
- var qualifiedName = DialectProvider . GetQuotedColumnName ( match . Item1 , match . Item2 ) ;
178
+ var qualifiedName = GetQuotedColumnName ( match . Item1 , match . Item2 . Name ) ;
177
179
178
180
if ( sb . Length > 0 )
179
181
sb . Append ( ", " ) ;
@@ -572,12 +574,14 @@ private SqlExpression<T> OrderByFields(string orderBySuffix, FieldDefinition[] f
572
574
return this ;
573
575
}
574
576
577
+ useFieldName = true ;
578
+
575
579
var sbOrderBy = StringBuilderCache . Allocate ( ) ;
576
580
foreach ( var field in fields )
577
581
{
578
582
var tableDef = GetModelDefinition ( field ) ;
579
583
var qualifiedName = modelDef != null
580
- ? DialectProvider . GetQuotedColumnName ( tableDef , field )
584
+ ? GetQuotedColumnName ( tableDef , field . Name )
581
585
: DialectProvider . GetQuotedColumnName ( field ) ;
582
586
583
587
if ( sbOrderBy . Length > 0 )
@@ -616,6 +620,8 @@ private SqlExpression<T> OrderByFields(string orderBySuffix, string[] fieldNames
616
620
return this ;
617
621
}
618
622
623
+ useFieldName = true ;
624
+
619
625
var sbOrderBy = StringBuilderCache . Allocate ( ) ;
620
626
foreach ( var fieldName in fieldNames )
621
627
{
@@ -628,7 +634,7 @@ private SqlExpression<T> OrderByFields(string orderBySuffix, string[] fieldNames
628
634
var field = FirstMatchingField ( useName ) ;
629
635
if ( field == null )
630
636
throw new ArgumentException ( "Could not find field " + useName ) ;
631
- var qualifiedName = DialectProvider . GetQuotedColumnName ( field . Item1 , field . Item2 ) ;
637
+ var qualifiedName = GetQuotedColumnName ( field . Item1 , field . Item2 . Name ) ;
632
638
633
639
if ( sbOrderBy . Length > 0 )
634
640
sbOrderBy . Append ( ", " ) ;
0 commit comments