backport changes from v3

MaceWindu · MaceWindu · commit a70fd5eb0464 · 2023-05-18T18:55:11.000+02:00
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -922,8 +922,9 @@ TransformInfo LocalTransform(Expression e)
 
 						if (typeof(IQueryable<>).IsSameOrParentOf(methodCall.Type) && methodCall.Type.Assembly != typeof(LinqExtensions).Assembly)
 						{
-							if (null == methodCall.Find(nonEvaluatableParameters,
-								    (c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t)))
+							if ((dc == null || dc.MappingSchema.GetAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method) == null)
+							    && null == methodCall.Find(nonEvaluatableParameters,
+								    (c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t) || t.NodeType == ExpressionType.Extension))
 							{
 								// Invoking function to evaluate EF's Subquery located in function
 

Original file line number	Diff line number	Diff line change
`@@ -922,8 +922,9 @@ TransformInfo LocalTransform(Expression e)`
`922`	`922`
`923`	`923`	`if (typeof(IQueryable<>).IsSameOrParentOf(methodCall.Type) && methodCall.Type.Assembly != typeof(LinqExtensions).Assembly)`
`924`	`924`	`{`
`925`		`- if (null == methodCall.Find(nonEvaluatableParameters,`
`926`		`- (c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t)))`
	`925`	`+ if ((dc == null \|\| dc.MappingSchema.GetAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method) == null)`
	`926`	`+ && null == methodCall.Find(nonEvaluatableParameters,`
	`927`	`+ (c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t) \|\| t.NodeType == ExpressionType.Extension))`
`927`	`928`	`{`
`928`	`929`	`// Invoking function to evaluate EF's Subquery located in function`
`929`	`930`