rework condition

MaceWindu · MaceWindu · commit af348bf8ff90 · 2023-05-18T19:16:09.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 ((dc == null || dc.MappingSchema.GetAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method) == null)
-							    && null == methodCall.Find(nonEvaluatableParameters,
+							if (((dc != null && !dc.MappingSchema.HasAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method))
+								|| (dc == null && !methodCall.Method.HasAttribute<ExpressionMethodAttribute>()))
+								&& 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 ((dc == null \|\| dc.MappingSchema.GetAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method) == null)`
`926`		`- && null == methodCall.Find(nonEvaluatableParameters,`
	`925`	`+ if (((dc != null && !dc.MappingSchema.HasAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method))`
	`926`	`+ \|\| (dc == null && !methodCall.Method.HasAttribute<ExpressionMethodAttribute>()))`
	`927`	`+ && null == methodCall.Find(nonEvaluatableParameters,`
`927`	`928`	`(c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t) \|\| t.NodeType == ExpressionType.Extension))`
`928`	`929`	`{`
`929`	`930`	`// Invoking function to evaluate EF's Subquery located in function`