Prevent expression reduce when looking for ordering method (#6255)

ChilliCream · Jun 16, 2023 · fda99f3 · fda99f3
1 parent 8a98efc
commit fda99f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/QueryableDefaultFieldHandler.cs b/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/QueryableDefaultFieldHandler.cs
@@ -161,6 +161,8 @@ public ReplaceVariableExpressionVisitor(
             _parameter = parameter;
         }
 
+        protected override Expression VisitExtension(Expression node) => node.CanReduce ? base.VisitExtension(node) : node;
+
         protected override Expression VisitParameter(ParameterExpression node)
         {
             if (node == _parameter)

diff --git a/...tChocolate/Data/src/Data/Sorting/Expressions/Extensions/QueryableSortContextExtensions.cs b/...tChocolate/Data/src/Data/Sorting/Expressions/Extensions/QueryableSortContextExtensions.cs
@@ -64,6 +64,8 @@ private sealed class OrderingMethodFinder : ExpressionVisitor
             return base.Visit(node);
         }
 
+        protected override Expression VisitExtension(Expression node) => node.CanReduce ? base.VisitExtension(node) : node;
+
         protected override Expression VisitMethodCall(MethodCallExpression node)
         {
             var name = node.Method.Name;

diff --git a/...tChocolate/Data/src/Data/Sorting/Expressions/Handlers/QueryableDefaultSortFieldHandler.cs b/...tChocolate/Data/src/Data/Sorting/Expressions/Handlers/QueryableDefaultSortFieldHandler.cs
@@ -117,6 +117,8 @@ public ReplaceVariableExpressionVisitor(
             _parameter = parameter;
         }
 
+        protected override Expression VisitExtension(Expression node) => node.CanReduce ? base.VisitExtension(node) : node;
+
         protected override Expression VisitParameter(ParameterExpression node)
         {
             if (node == _parameter)