Fixed sorting on picklist names

MarkMpn · Mar 27, 2024 · 73642dd · 73642dd
1 parent a5f0f0a
commit 73642dd
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/SortNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/SortNode.cs
@@ -396,11 +396,15 @@ private IDataExecutionPlanNodeInternal FoldSorts(NodeCompilationContext context)
 
                                     if (attribute != null)
                                     {
-                                        if (attribute is LookupAttributeMetadata || useRawOrderBy == true)
-                                            return this;
-
                                         fetchSort.attribute = attribute.LogicalName;
-                                        useRawOrderBy = false;
+
+                                        if (attribute is EnumAttributeMetadata || attribute is BooleanAttributeMetadata)
+                                        {
+                                            if (useRawOrderBy == true)
+                                                return this;
+
+                                            useRawOrderBy = false;
+                                        }
                                     }
                                 }
                             }
@@ -446,11 +450,15 @@ private IDataExecutionPlanNodeInternal FoldSorts(NodeCompilationContext context)
 
                                 if (attribute != null)
                                 {
-                                    if (attribute is LookupAttributeMetadata || useRawOrderBy == true)
-                                        return this;
-
                                     fetchSort.attribute = attribute.LogicalName;
-                                    useRawOrderBy = false;
+
+                                    if (attribute is EnumAttributeMetadata || attribute is BooleanAttributeMetadata)
+                                    {
+                                        if (useRawOrderBy == true)
+                                            return this;
+
+                                        useRawOrderBy = false;
+                                    }
                                 }
                             }