@@ -137,6 +137,8 @@ public virtual SqlExpression<T> Select(string[] fields)
137137 if ( fields == null || fields . Length == 0 )
138138 return Select ( string . Empty ) ;
139139
140+ useFieldName = true ;
141+
140142 var allTableDefs = new List < ModelDefinition > { modelDef } ;
141143 allTableDefs . AddRange ( tableDefs ) ;
142144
@@ -155,7 +157,7 @@ public virtual SqlExpression<T> Select(string[] fields)
155157 {
156158 foreach ( var fieldDef in tableDef . FieldDefinitionsArray )
157159 {
158- var qualifiedField = DialectProvider . GetQuotedColumnName ( tableDef , fieldDef ) ;
160+ var qualifiedField = GetQuotedColumnName ( tableDef , fieldDef . Name ) ;
159161
160162 if ( sb . Length > 0 )
161163 sb . Append ( ", " ) ;
@@ -173,7 +175,7 @@ public virtual SqlExpression<T> Select(string[] fields)
173175 if ( match == null )
174176 continue ;
175177
176- var qualifiedName = DialectProvider . GetQuotedColumnName ( match . Item1 , match . Item2 ) ;
178+ var qualifiedName = GetQuotedColumnName ( match . Item1 , match . Item2 . Name ) ;
177179
178180 if ( sb . Length > 0 )
179181 sb . Append ( ", " ) ;
@@ -572,12 +574,14 @@ private SqlExpression<T> OrderByFields(string orderBySuffix, FieldDefinition[] f
572574 return this ;
573575 }
574576
577+ useFieldName = true ;
578+
575579 var sbOrderBy = StringBuilderCache . Allocate ( ) ;
576580 foreach ( var field in fields )
577581 {
578582 var tableDef = GetModelDefinition ( field ) ;
579583 var qualifiedName = modelDef != null
580- ? DialectProvider . GetQuotedColumnName ( tableDef , field )
584+ ? GetQuotedColumnName ( tableDef , field . Name )
581585 : DialectProvider . GetQuotedColumnName ( field ) ;
582586
583587 if ( sbOrderBy . Length > 0 )
@@ -616,6 +620,8 @@ private SqlExpression<T> OrderByFields(string orderBySuffix, string[] fieldNames
616620 return this ;
617621 }
618622
623+ useFieldName = true ;
624+
619625 var sbOrderBy = StringBuilderCache . Allocate ( ) ;
620626 foreach ( var fieldName in fieldNames )
621627 {
@@ -628,7 +634,7 @@ private SqlExpression<T> OrderByFields(string orderBySuffix, string[] fieldNames
628634 var field = FirstMatchingField ( useName ) ;
629635 if ( field == null )
630636 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 ) ;
632638
633639 if ( sbOrderBy . Length > 0 )
634640 sbOrderBy . Append ( ", " ) ;
0 commit comments