chore: fix clip

ibis-project · Sep 26, 2023 · ff5855e · ff5855e
1 parent a2b848d
commit ff5855e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/ibis/backends/duckdb/compiler/values.py b/ibis/backends/duckdb/compiler/values.py
@@ -307,10 +307,18 @@ def _generic_log(op, **kw):
 def _clip(op, **kw):
     arg = translate_val(op.arg, **kw)
     if (upper := op.upper) is not None:
-        arg = sg.exp.Least.from_arg_list([translate_val(upper, **kw), arg])
+        arg = sg.exp.If(
+            this=arg.is_(NULL),
+            true=sg.exp.NULL,
+            false=sg.exp.Least.from_arg_list([translate_val(upper, **kw), arg]),
+        )
 
     if (lower := op.lower) is not None:
-        arg = sg.exp.Greatest.from_arg_list([translate_val(lower, **kw), arg])
+        arg = sg.exp.If(
+            this=arg.is_(NULL),
+            true=sg.exp.NULL,
+            false=sg.exp.Greatest.from_arg_list([translate_val(lower, **kw), arg]),
+        )
 
     return arg
 

diff --git a/ibis/backends/tests/test_numeric.py b/ibis/backends/tests/test_numeric.py
@@ -1386,7 +1386,8 @@ def test_random(con):
 @pytest.mark.notimpl(["datafusion"], raises=com.OperationNotDefinedError)
 def test_clip(backend, alltypes, df, ibis_func, pandas_func):
     result = ibis_func(alltypes.int_col).execute()
-    expected = pandas_func(df.int_col).astype(result.dtype)
+    raw_expected = pandas_func(df.int_col)
+    expected = raw_expected.astype(result.dtype)
     # Names won't match in the PySpark backend since PySpark
     # gives 'tmp' name when executing a Column
     backend.assert_series_equal(result, expected, check_names=False)