feat(rust, python): raise on both sides of datetime/str comparison (p…

…ola-rs#9692)
c-peters · Jul 14, 2023 · 00c3cf6 · 00c3cf6
1 parent 38e237d
commit 00c3cf6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/polars/polars-lazy/polars-plan/src/logical_plan/optimizer/type_coercion/binary.rs b/polars/polars-lazy/polars-plan/src/logical_plan/optimizer/type_coercion/binary.rs
@@ -229,9 +229,11 @@ pub(super) fn process_binary(
             return Ok(None)
         }
         #[cfg(feature = "dtype-date")]
-        (Date, Utf8, op) if op.is_comparison() => err_date_str_compare()?,
+        (Date, Utf8, op) | (Utf8, Date, op) if op.is_comparison() => err_date_str_compare()?,
         #[cfg(feature = "dtype-datetime")]
-        (Datetime(_, _), Utf8, op) if op.is_comparison() => err_date_str_compare()?,
+        (Datetime(_, _), Utf8, op) | (Utf8, Datetime(_, _), op) if op.is_comparison() => {
+            err_date_str_compare()?
+        }
         #[cfg(feature = "dtype-time")]
         (Time, Utf8, op) if op.is_comparison() => err_date_str_compare()?,
         // structs can be arbitrarily nested, leave the complexity to the caller for now.

diff --git a/py-polars/tests/unit/test_errors.py b/py-polars/tests/unit/test_errors.py
@@ -425,7 +425,14 @@ def test_err_filter_no_expansion() -> None:
         df.filter(pl.col(pl.Int16).min() < 0.1)
 
 
-def test_date_string_comparison() -> None:
+@pytest.mark.parametrize(
+    ("e"),
+    [
+        pl.col("date") > "2021-11-10",
+        pl.col("date") < "2021-11-10",
+    ],
+)
+def test_date_string_comparison(e: pl.Expr) -> None:
     df = pl.DataFrame(
         {
             "date": [
@@ -439,7 +446,7 @@ def test_date_string_comparison() -> None:
     with pytest.raises(
         pl.ComputeError, match=r"cannot compare 'date/datetime/time' to a string value"
     ):
-        df.select(pl.col("date") > "2021-11-10")
+        df.select(e)
 
 
 def test_err_on_multiple_column_expansion() -> None: