fix(clickhouse): raise OperationNotDefinedError if operation is not s…

…upported
ibis-project · Jan 30, 2023 · 71e2570 · 71e2570
1 parent 813c95e
commit 71e2570
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/ibis/backends/clickhouse/compiler/relations.py b/ibis/backends/clickhouse/compiler/relations.py
@@ -5,6 +5,7 @@
 
 import sqlglot as sg
 
+import ibis.common.exceptions as com
 import ibis.expr.datatypes as dt
 import ibis.expr.operations as ops
 from ibis.backends.clickhouse.compiler.values import translate_val
@@ -13,7 +14,7 @@
 @functools.singledispatch
 def translate_rel(op: ops.TableNode, **_):
     """Translate a table node into sqlglot."""
-    raise NotImplementedError(type(op))
+    raise com.OperationNotDefinedError(f'No translation rule for {type(op)}')
 
 
 @translate_rel.register(ops.DummyTable)

diff --git a/ibis/backends/clickhouse/compiler/values.py b/ibis/backends/clickhouse/compiler/values.py
@@ -25,7 +25,7 @@
 @functools.singledispatch
 def translate_val(op, **_):
     """Translate a value expression into sqlglot."""
-    raise NotImplementedError(type(op))
+    raise com.OperationNotDefinedError(f'No translation rule for {type(op)}')
 
 
 @translate_val.register(dt.DataType)

diff --git a/ibis/backends/tests/test_generic.py b/ibis/backends/tests/test_generic.py
@@ -1055,15 +1055,10 @@ def test_exists(batting, awards_players, method_name):
             },
             marks=[
                 pytest.mark.broken(
-                    ['impala'],
+                    ['clickhouse', 'impala'],
                     "No translation rule for <class 'ibis.expr.operations.temporal.DateFromYMD'>",
                     raises=com.OperationNotDefinedError,
                 ),
-                pytest.mark.broken(
-                    ['clickhouse'],
-                    "<class 'ibis.expr.operations.temporal.DateFromYMD'>",
-                    raises=NotImplementedError,
-                ),
             ],
             id="date",
         ),
@@ -1079,12 +1074,7 @@ def test_exists(batting, awards_players, method_name):
             },
             marks=[
                 pytest.mark.broken(
-                    ['clickhouse'],
-                    "<class 'ibis.expr.operations.temporal.TimeFromHMS'>",
-                    raises=NotImplementedError,
-                ),
-                pytest.mark.broken(
-                    ['impala'],
+                    ['clickhouse', 'impala'],
                     "No translation rule for <class 'ibis.expr.operations.temporal.TimeFromHMS'>",
                     raises=com.OperationNotDefinedError,
                 ),