Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit 46361ef

Browse files
committed
fix merge
1 parent 0df1083 commit 46361ef

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -547,12 +547,6 @@ public virtual MappingSchema GetMappingSchema(
547547
static readonly MethodInfo TagWithMethodInfo =
548548
MemberHelper.MethodOfGeneric<IQueryable<object>>(q => q.TagWith(string.Empty));
549549

550-
static readonly MethodInfo AsSplitQueryMethodInfo =
551-
MemberHelper.MethodOfGeneric<IQueryable<object>>(q => q.AsSplitQuery());
552-
553-
static readonly MethodInfo AsSingleQueryMethodInfo =
554-
MemberHelper.MethodOfGeneric<IQueryable<object>>(q => q.AsSingleQuery());
555-
556550
static readonly MethodInfo ThenIncludeEnumerableMethodInfo =
557551
MemberHelper.MethodOfGeneric<IIncludableQueryable<object, IEnumerable<object>>>(q => q.ThenInclude<object, object, object>(null!));
558552

@@ -887,11 +881,6 @@ TransformInfo LocalTransform(Expression e)
887881
break;
888882
}
889883

890-
if (generic == AsSplitQueryMethodInfo || generic == AsSingleQueryMethodInfo)
891-
{
892-
return new TransformInfo(methodCall.Arguments[0], false, true);
893-
}
894-
895884
if (typeof(ITable<>).IsSameOrParentOf(methodCall.Type))
896885
{
897886
if (generic.Name == "ToLinqToDBTable")
@@ -913,7 +902,7 @@ TransformInfo LocalTransform(Expression e)
913902

914903
if (typeof(IQueryable<>).IsSameOrParentOf(methodCall.Type) && methodCall.Type.Assembly != typeof(LinqExtensions).Assembly)
915904
{
916-
if (dc.MappingSchema.GetAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method) == null
905+
if ((dc == null || dc.MappingSchema.GetAttribute<ExpressionMethodAttribute>(methodCall.Type, methodCall.Method) == null)
917906
&& null == methodCall.Find(nonEvaluatableParameters,
918907
(c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t) || t.NodeType == ExpressionType.Extension))
919908
{

0 commit comments

Comments
 (0)