@@ -166,15 +166,12 @@ private static bool IsColumnStub(SqlColumn column)
166166 return column is SqlColumnRef columnRef && columnRef . SqlColumn is SqlColumnStub ;
167167 }
168168
169- private static bool IsTypeIdColumn ( SqlColumn column )
170- {
171- if ( column is SqlUserColumn )
172- return string . Equals ( column . Name , "TypeId" , StringComparison . OrdinalIgnoreCase ) ;
173- var cRef = column as SqlColumnRef ;
174- if ( ! ReferenceEquals ( null , cRef ) )
175- return string . Equals ( cRef . Name , "TypeId" , StringComparison . OrdinalIgnoreCase ) ;
176- return false ;
177- }
169+ private static bool IsTypeIdColumn ( SqlColumn column ) =>
170+ column switch {
171+ SqlUserColumn _ => string . Equals ( column . Name , "TypeId" , StringComparison . OrdinalIgnoreCase ) ,
172+ SqlColumnRef cRef => string . Equals ( cRef . Name , "TypeId" , StringComparison . OrdinalIgnoreCase ) ,
173+ _ => false
174+ } ;
178175
179176 private static SqlColumnStub ExtractColumnStub ( SqlColumn column ) =>
180177 column switch {
@@ -290,7 +287,7 @@ private static bool ShouldUseQueryReference(CompilableProvider origin, SqlProvid
290287 return orderingOverCalculatedColumn ;
291288 }
292289 default :
293- var typeIdIsOnlyCalculatedColumn = containsCalculatedColumns && ( calculatedColumnIndexes . Count == 1 )
290+ var typeIdIsOnlyCalculatedColumn = containsCalculatedColumns && calculatedColumnIndexes . Count == 1
294291 && IsTypeIdColumn ( sourceSelect . Columns [ calculatedColumnIndexes [ 0 ] ] ) ;
295292 return ( containsCalculatedColumns && ! typeIdIsOnlyCalculatedColumn ) || distinctIsUsed || pagingIsUsed || groupByIsUsed ;
296293 }
0 commit comments