From db7a513b6413c570032f84bc65c7f2221f342bd4 Mon Sep 17 00:00:00 2001 From: Christopher Jolly Date: Thu, 7 Sep 2023 23:13:49 +0800 Subject: [PATCH] Remove the DeepSkip tag on FirstOrDefault. When generating the sql it was preventing the TOP expression from being generated --- .../JetQueryableMethodTranslatingExpressionVisitor.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/EFCore.Jet/Query/Internal/JetQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Jet/Query/Internal/JetQueryableMethodTranslatingExpressionVisitor.cs index 97cf430..c4ff3bd 100644 --- a/src/EFCore.Jet/Query/Internal/JetQueryableMethodTranslatingExpressionVisitor.cs +++ b/src/EFCore.Jet/Query/Internal/JetQueryableMethodTranslatingExpressionVisitor.cs @@ -149,4 +149,12 @@ public class JetQueryableMethodTranslatingExpressionVisitor : RelationalQueryabl } return base.TranslateTake(source, count); } + + protected override ShapedQueryExpression? TranslateFirstOrDefault(ShapedQueryExpression source, LambdaExpression? predicate, + Type returnType, bool returnDefault) + { + var selectExpression = (SelectExpression)source.QueryExpression; + selectExpression.Tags.Remove("DeepSkip"); + return base.TranslateFirstOrDefault(source, predicate, returnType, returnDefault); + } }