test(pyspark): specify expected failures for merge

Author: deepyaman

ibis/backends/tests/errors.py

@@ -55,13 +55,18 @@
     from pyspark.errors.exceptions.base import ParseException as PySparkParseException
     from pyspark.errors.exceptions.base import PySparkValueError
     from pyspark.errors.exceptions.base import PythonException as PySparkPythonException
+    from pyspark.errors.exceptions.base import (
+        UnsupportedOperationException as PySparkUnsupportedOperationException,
+    )
     from pyspark.errors.exceptions.connect import (
         SparkConnectGrpcException as PySparkConnectGrpcException,
     )
 except ImportError:
     PySparkParseException = PySparkAnalysisException = PySparkArithmeticException = (
         PySparkPythonException
-    ) = PySparkConnectGrpcException = PySparkValueError = None
+    ) = PySparkUnsupportedOperationException = PySparkConnectGrpcException = (
+        PySparkValueError
+    ) = None
 
 try:
     from google.api_core.exceptions import BadRequest as GoogleBadRequest

ibis/backends/tests/test_client.py

@@ -36,6 +36,7 @@
     PyAthenaDatabaseError,
     PyDruidProgrammingError,
     PyODBCProgrammingError,
+    PySparkUnsupportedOperationException,
     SnowflakeProgrammingError,
     TrinoUserError,
 )
@@ -49,6 +50,7 @@
 pd = pytest.importorskip("pandas")
 pa = pytest.importorskip("pyarrow")
 ds = pytest.importorskip("pyarrow.dataset")
+pyspark = pytest.importorskip("pyspark")
 
 
 @pytest.fixture
@@ -656,6 +658,13 @@ def _emp(a, b, c, d):
 
 
 @pytest.mark.notimpl(["polars"], reason="`upsert` method not implemented")
+@pytest.mark.notyet(
+    ["pyspark"],
+    raises=PySparkUnsupportedOperationException
+    if vparse(pyspark.__version__) >= vparse("3.5")
+    else Py4JJavaError,
+    reason="MERGE INTO TABLE is not supported temporarily",
+)
 @pytest.mark.notyet(
     ["trino"],
     raises=TrinoUserError,
@@ -679,6 +688,13 @@ def test_upsert_from_dataframe(
 
 
 @pytest.mark.notimpl(["polars"], reason="`upsert` method not implemented")
+@pytest.mark.notyet(
+    ["pyspark"],
+    raises=PySparkUnsupportedOperationException
+    if vparse(pyspark.__version__) >= vparse("3.5")
+    else Py4JJavaError,
+    reason="MERGE INTO TABLE is not supported temporarily",
+)
 @pytest.mark.notyet(
     ["trino"],
     raises=TrinoUserError,