@@ -794,19 +794,35 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
794794 // Add the destination name
795795 valueSql = valueSql. Replace( "AS [ C1] ", "") ;
796796
797- valueSql = valueSql . Replace ( "[Extent1]" , "B" )
798- . Replace ( "[Extent2]" , "B" )
799- . Replace ( "[Extent3]" , "B" )
800- . Replace ( "[Extent4]" , "B" )
801- . Replace ( "[Extent5]" , "B" )
802- . Replace ( "[Extent6]" , "B" )
803- . Replace ( "[Extent7]" , "B" )
804- . Replace ( "[Extent8]" , "B" )
805- . Replace ( "[Extent9]" , "B" )
806- . Replace ( "[Filter1]" , "B" )
807- . Replace ( "[Filter2]" , "B" )
808- . Replace ( "[Filter3]" , "B" )
809- . Replace ( "[Filter4]" , "B" ) ;
797+ var listReplace = new List < string > ( )
798+ {
799+ "[Extent1]" ,
800+ "[Extent2]" ,
801+ "[Extent3]" ,
802+ "[Extent4]" ,
803+ "[Extent5]" ,
804+ "[Extent6]" ,
805+ "[Extent7]" ,
806+ "[Extent8]" ,
807+ "[Extent9]" ,
808+ "[Filter1]" ,
809+ "[Filter2]" ,
810+ "[Filter3]" ,
811+ "[Filter4]" ,
812+ "[Filter5]" ,
813+ "[Filter6]" ,
814+ } ;
815+
816+ // Replace the first value found only!
817+ foreach ( var itemReplace in listReplace)
818+ {
819+ if ( valueSql . Contains ( itemReplace ) )
820+ {
821+ valueSql = valueSql. Replace ( itemReplace , "B" ) ;
822+ break ;
823+ }
824+ }
825+
810826#elif EFCORE
811827 RelationalQueryContext queryContext ;
812828 var command = ( ( IQueryable ) result) . CreateCommand ( out queryContext ) ;
0 commit comments