Merge pull request #1970 from mabel-dev/#1967-1

#1967
mabel-dev · Aug 31, 2024 · a206088 · a206088
2 parents feeedfc + d862063
commit a206088
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/opteryx/__version__.py b/opteryx/__version__.py
@@ -1,4 +1,4 @@
-__build__ = 759
+__build__ = 760
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/opteryx/planner/cost_based_optimizer/strategies/constant_folding.py b/opteryx/planner/cost_based_optimizer/strategies/constant_folding.py
@@ -53,9 +53,17 @@ def build_literal_node(value: Any, root: Node, suggested_type: OrsoTypes):
     if hasattr(value, "as_py"):
         value = value.as_py()
 
+    if value is None:
+        # Matching None has complications
+        root.value = None
+        root.node_type = NodeType.LITERAL
+        root.type = OrsoTypes.NULL
+        root.left = None
+        root.right = None
+        return root
+
     # Define a mapping of types to OrsoTypes
     type_mapping = {
-        None: OrsoTypes.NULL,
         bool: OrsoTypes.BOOLEAN,
         numpy.bool_: OrsoTypes.BOOLEAN,
         str: OrsoTypes.VARCHAR,

diff --git a/tests/sql_battery/test_results_battery.py b/tests/sql_battery/test_results_battery.py
@@ -71,7 +71,7 @@ def test_results_tests(test):
 
     start_suite = time.monotonic_ns()
 
-    width = shutil.get_terminal_size((80, 20))[0] - 40
+    width = shutil.get_terminal_size((80, 20))[0] - 42
 
     passed = 0
     failed = 0