Merge pull request #1068 from mabel-dev/#1017/13

#1017
mabel-dev · Jun 10, 2023 · 679b271 · 679b271
2 parents 8be4e78 + a96a608
commit 679b271
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/opteryx/components/v2/logical_planner.py b/opteryx/components/v2/logical_planner.py
@@ -115,7 +115,7 @@ def __str__(self):
                     return f"{self.type.upper()} (USING {','.join(format_expression(self.using))})"
                 return self.type.upper()
             if node_type == LogicalPlanStepType.Order:
-                return f"ORDER BY ({', '.join(item[0] + (' DESC' if not item[1] else '') for item in self.order_by)})"
+                return f"ORDER BY ({', '.join(format_expression(item[0]) + (' DESC' if not item[1] else '') for item in self.order_by)})"
             if node_type == LogicalPlanStepType.Project:
                 return f"PROJECT ({', '.join(format_expression(col) for col in self.columns)})"
             if node_type == LogicalPlanStepType.Scan:
@@ -281,7 +281,7 @@ def inner_query_planner(ast_branch):
     if _order_by:
         order_step = LogicalPlanNode(node_type=LogicalPlanStepType.Order)
         order_step.order_by = [
-            (logical_planner_builders.build(item["expr"]).value, not bool(item["asc"]))
+            (logical_planner_builders.build(item["expr"]), not bool(item["asc"]))
             for item in _order_by
         ]
         previous_step_id, step_id = step_id, random_string()

diff --git a/opteryx/components/v2/temporary_physical_planner.py b/opteryx/components/v2/temporary_physical_planner.py
@@ -40,7 +40,7 @@ def create_physical_plan(logical_plan):
         elif node_type == LogicalPlanStepType.Fake:
             node = operators.NoOpNode(query_properties, **node_config)
         elif node_type == LogicalPlanStepType.Filter:
-            node = operators.NoOpNode(query_properties, **node_config)
+            node = operators.SelectionNode(query_properties, filter=node_config["condition"])
         elif node_type == LogicalPlanStepType.GenerateSeries:
             node = operators.NoOpNode(query_properties, **node_config)
         elif node_type == LogicalPlanStepType.Group:
@@ -49,6 +49,8 @@ def create_physical_plan(logical_plan):
             node = operators.NoOpNode(query_properties, **node_config)
         elif node_type == LogicalPlanStepType.Order:
             node = operators.NoOpNode(query_properties, **node_config)
+        #           we need a gen 2 order by that doesn't rely on the columns object
+        #            node = operators.SortNode(query_properties, order=node_config["order_by"])
         elif node_type == LogicalPlanStepType.Project:
             node = operators.NoOpNode(query_properties, **node_config)
         elif node_type == LogicalPlanStepType.Scan:

diff --git a/tests/sql_battery/test_shapes_and_errors_battery.py b/tests/sql_battery/test_shapes_and_errors_battery.py
@@ -230,6 +230,7 @@
         ("SELECT TRY_CAST(planetId AS VARCHAR) FROM $satellites", 177, 1, None),
         ("SELECT TRY_CAST(planetId AS TIMESTAMP) FROM $satellites", 177, 1, None),
         ("SELECT TRY_CAST(planetId AS NUMERIC) FROM $satellites", 177, 1, None),
+        ("SELECT * FROM $planets WHERE id = GET(STRUCT('{\"a\":1,\"b\":\"c\"}'), 'a')", 1, 20, None),
 
         ("SELECT PI()", 1, 1, None),
         ("SELECT E()", 1, 1, None),