feat: add tests for changing current catalog/schema

Author: lidavidm

adbc_drivers_validation/model.py

@@ -78,6 +78,8 @@ class DriverSetup:
 @dataclasses.dataclass
 class DriverFeatures:
     connection_get_table_schema: bool = False
+    connection_set_current_catalog: bool = False
+    connection_set_current_schema: bool = False
     connection_transactions: bool = False
     statement_bulk_ingest: bool = False
     statement_bulk_ingest_catalog: bool = False
@@ -97,6 +99,8 @@ def __init__(
         self,
         *,
         connection_get_table_schema=False,
+        connection_set_current_catalog=False,
+        connection_set_current_schema=False,
         connection_transactions=False,
         statement_bulk_ingest=False,
         statement_bulk_ingest_catalog=False,
@@ -113,6 +117,8 @@ def __init__(
         supported_xdbc_fields=None,
     ):
         self.connection_get_table_schema = connection_get_table_schema
+        self.connection_set_current_catalog = connection_set_current_catalog
+        self.connection_set_current_schema = connection_set_current_schema
         self.connection_transactions = connection_transactions
         self.statement_bulk_ingest = statement_bulk_ingest
         self.statement_bulk_ingest_catalog = statement_bulk_ingest_catalog

adbc_drivers_validation/tests/conftest.py

@@ -67,7 +67,7 @@ def manual_test() -> None:
         pytest.skip("Skipping manual test, set RUN_MANUAL_TESTS=1")
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture(scope="session")
 def conn_factory(
     request,
     driver: model.DriverQuirks,

adbc_drivers_validation/tests/connection.py

@@ -19,6 +19,8 @@
 pytest_generate_tests hook, call generate_tests.
 """
 
+import typing
+
 import adbc_driver_manager.dbapi
 import pyarrow
 import pytest
@@ -60,15 +62,49 @@ def generate_tests(quirks: model.DriverQuirks, metafunc) -> None:
 
 class TestConnection:
     def test_current_catalog(
-        self, conn: adbc_driver_manager.dbapi.Connection, driver: model.DriverQuirks
+        self,
+        driver: model.DriverQuirks,
+        conn: adbc_driver_manager.dbapi.Connection,
     ) -> None:
         assert conn.adbc_current_catalog == driver.features.current_catalog
 
     def test_current_db_schema(
-        self, conn: adbc_driver_manager.dbapi.Connection, driver: model.DriverQuirks
+        self,
+        driver: model.DriverQuirks,
+        conn: adbc_driver_manager.dbapi.Connection,
     ) -> None:
         assert conn.adbc_current_db_schema == driver.features.current_schema
 
+    def test_set_current_catalog(
+        self,
+        driver: model.DriverQuirks,
+        conn_factory: typing.Callable[[], adbc_driver_manager.dbapi.Connection],
+    ):
+        if not driver.features.connection_set_current_catalog:
+            pytest.skip("not implemented")
+
+        with conn_factory() as conn:
+            assert conn.adbc_current_catalog == driver.features.current_catalog
+            conn.adbc_current_catalog = driver.features.secondary_catalog
+            assert conn.adbc_current_catalog == driver.features.secondary_catalog
+            conn.adbc_current_catalog = driver.features.current_catalog
+            assert conn.adbc_current_catalog == driver.features.current_catalog
+
+    def test_set_current_schema(
+        self,
+        driver: model.DriverQuirks,
+        conn_factory: typing.Callable[[], adbc_driver_manager.dbapi.Connection],
+    ):
+        if not driver.features.connection_set_current_schema:
+            pytest.skip("not implemented")
+
+        with conn_factory() as conn:
+            assert conn.adbc_current_db_schema == driver.features.current_schema
+            conn.adbc_current_db_schema = driver.features.secondary_schema
+            assert conn.adbc_current_db_schema == driver.features.secondary_schema
+            conn.adbc_current_db_schema = driver.features.current_schema
+            assert conn.adbc_current_db_schema == driver.features.current_schema
+
     def test_get_info(
         self, conn: adbc_driver_manager.dbapi.Connection, driver: model.DriverQuirks
     ) -> None:

adbc_drivers_validation/tests/ingest.py

@@ -34,15 +34,13 @@ def generate_tests(quirks: model.DriverQuirks, metafunc) -> None:
     """Parameterize the tests in this module for the given driver."""
     combinations = []
 
-    if (
-        enabled := {
-            "test_not_null": True,
-            "test_temporary": quirks.features.statement_bulk_ingest_temporary,
-            "test_schema": quirks.features.statement_bulk_ingest_schema,
-            "test_catalog": quirks.features.statement_bulk_ingest_catalog,
-        }.get(metafunc.definition.name, None)
-        is not None
-    ):
+    enabled = {
+        "test_not_null": True,
+        "test_temporary": quirks.features.statement_bulk_ingest_temporary,
+        "test_schema": quirks.features.statement_bulk_ingest_schema,
+        "test_catalog": quirks.features.statement_bulk_ingest_catalog,
+    }.get(metafunc.definition.name, None)
+    if enabled is not None:
         marks = []
         if not enabled:
             marks.append(pytest.mark.skip(reason="not implemented"))