mariadb client

Author: provinzkraut

.github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
 
       - if: runner.os == 'Linux'
         name: Install Microsoft ODBC Drivers
-        run: sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
+        run: sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5

pyproject.toml

@@ -60,6 +60,7 @@ dragonfly = ["redis"]
 elasticsearch7 = ["elasticsearch7"]
 elasticsearch8 = ["elasticsearch8"]
 keydb = ["redis"]
+mariadb = ["mariadb"]
 mssql = ["pymssql<=2.3.1"]
 mysql = ["mysql-connector-python"]
 oracle = ["oracledb"]
@@ -71,7 +72,7 @@ spanner = ["google-cloud-spanner"]
 [dependency-groups]
 dev = [
   # tests
-  "pytest-databases[azure-storage,bigquery,cockroachdb,dragonfly,elasticsearch7,elasticsearch8,keydb,mssql,mysql,oracle,postgres,redis,spanner]",
+  "pytest-databases[azure-storage,bigquery,cockroachdb,dragonfly,elasticsearch7,elasticsearch8,keydb,mssql,mysql,mariadb,oracle,postgres,redis,spanner]",
   "coverage[toml]>=6.2",
   "coverage[toml]>=6.2",
   "pytest",

src/pytest_databases/docker/mariadb.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 import contextlib
+import traceback
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Generator
 
-import pymysql
+import mariadb
 import pytest
 
 from pytest_databases.helpers import get_xdist_worker_num
@@ -42,14 +43,15 @@ def _provide_mysql_service(
 
     def check(_service: ServiceContainer) -> bool:
         try:
-            conn = pymysql.connect(
+            conn = mariadb.connect(
                 host=_service.host,
                 port=_service.port,
                 user=user,
                 database=database,
                 password=password,
             )
         except Exception:  # noqa: BLE001
+            traceback.print_exc()
             return False
 
         try:
@@ -121,8 +123,8 @@ def mariadb_service(mariadb_113_service: MariaDBService) -> MariaDBService:
 
 
 @pytest.fixture(autouse=False, scope="session")
-def mariadb_113_connection(mariadb_113_service: MariaDBService) -> Generator[pymysql.Connection, None, None]:
-    with pymysql.connect(
+def mariadb_113_connection(mariadb_113_service: MariaDBService) -> Generator[mariadb.Connection, None, None]:
+    with mariadb.connect(
         host=mariadb_113_service.host,
         port=mariadb_113_service.port,
         user=mariadb_113_service.user,
@@ -133,5 +135,5 @@ def mariadb_113_connection(mariadb_113_service: MariaDBService) -> Generator[pym
 
 
 @pytest.fixture(autouse=False, scope="session")
-def mariadb_connection(mariadb_113_connection: pymysql.Connection) -> pymysql.Connection:
+def mariadb_connection(mariadb_113_connection: mariadb.Connection) -> mariadb.Connection:
     return mariadb_113_connection

src/pytest_databases/docker/mysql.py

@@ -5,7 +5,6 @@
 from typing import TYPE_CHECKING
 
 import mysql.connector
-from mysql.connector.abstracts import MySQLConnectionAbstract
 import pytest
 
 from pytest_databases._service import DockerService, ServiceContainer
@@ -14,6 +13,8 @@
 if TYPE_CHECKING:
     from collections.abc import Generator
 
+    from mysql.connector.abstracts import MySQLConnectionAbstract
+
     from pytest_databases.types import XdistIsolationLevel
 
 
@@ -104,12 +105,12 @@ def check(_service: ServiceContainer) -> bool:
         )
 
 
-@pytest.fixture(autouse=False, scope="session")
+@pytest.fixture(scope="session")
 def mysql_service(mysql_8_service: MySQLService) -> MySQLService:
     return mysql_8_service
 
 
-@pytest.fixture(autouse=False, scope="session")
+@pytest.fixture(scope="session")
 def mysql_56_service(
     docker_service: DockerService,
     xdist_mysql_isolation_level: XdistIsolationLevel,
@@ -123,7 +124,7 @@ def mysql_56_service(
         yield service
 
 
-@pytest.fixture(autouse=False, scope="session")
+@pytest.fixture(scope="session")
 def mysql_57_service(
     docker_service: DockerService,
     xdist_mysql_isolation_level: XdistIsolationLevel,
@@ -137,7 +138,7 @@ def mysql_57_service(
         yield service
 
 
-@pytest.fixture(autouse=False, scope="session")
+@pytest.fixture(scope="session")
 def mysql_8_service(
     docker_service: DockerService,
     xdist_mysql_isolation_level: XdistIsolationLevel,
@@ -151,10 +152,8 @@ def mysql_8_service(
         yield service
 
 
-@pytest.fixture(autouse=False, scope="session")
-def mysql_56_connection(
-    mysql_56_service: MySQLService,
-) -> Generator[MySQLConnectionAbstract, None, None]:
+@pytest.fixture(scope="session")
+def mysql_56_connection(mysql_56_service: MySQLService) -> Generator[MySQLConnectionAbstract, None, None]:
     with mysql.connector.connect(
         host=mysql_56_service.host,
         port=mysql_56_service.port,
@@ -165,10 +164,8 @@ def mysql_56_connection(
         yield conn
 
 
-@pytest.fixture(autouse=False, scope="session")
-def mysql_57_connection(
-    mysql_57_service: MySQLService,
-) -> Generator[MySQLConnectionAbstract, None, None]:
+@pytest.fixture(scope="session")
+def mysql_57_connection(mysql_57_service: MySQLService) -> Generator[MySQLConnectionAbstract, None, None]:
     with mysql.connector.connect(
         host=mysql_57_service.host,
         port=mysql_57_service.port,
@@ -179,13 +176,13 @@ def mysql_57_connection(
         yield conn
 
 
-@pytest.fixture(autouse=False, scope="session")
-def mysql_connection(mysql_8_connection) -> MySQLConnectionAbstract:
+@pytest.fixture(scope="session")
+def mysql_connection(mysql_8_connection: MySQLConnectionAbstract) -> MySQLConnectionAbstract:
     return mysql_8_connection
 
 
-@pytest.fixture(autouse=False, scope="session")
-def mysql_8_connection(mysql_8_service) -> Generator[MySQLConnectionAbstract, None, None]:
+@pytest.fixture(scope="session")
+def mysql_8_connection(mysql_8_service: MySQLService) -> Generator[MySQLConnectionAbstract, None, None]:
     with mysql.connector.connect(
         host=mysql_8_service.host,
         port=mysql_8_service.port,

tests/test_mariadb.py

@@ -12,11 +12,12 @@
 )
 def test_service_fixture(pytester: pytest.Pytester, service_fixture: str) -> None:
     pytester.makepyfile(f"""
-    import pymysql
+    import mariadb
+
     pytest_plugins = ["pytest_databases.docker.mariadb"]
 
     def test({service_fixture}):
-        with pymysql.connect(
+        with mariadb.connect(
             host={service_fixture}.host,
             port={service_fixture}.port,
             user={service_fixture}.user,
@@ -41,7 +42,6 @@ def test({service_fixture}):
 )
 def test_connection_fixture(pytester: pytest.Pytester, connection_fixture: str) -> None:
     pytester.makepyfile(f"""
-    import pymysql
     pytest_plugins = ["pytest_databases.docker.mariadb"]
 
     def test({connection_fixture}):
@@ -58,7 +58,6 @@ def test({connection_fixture}):
 
 def test_xdist_isolate_database(pytester: pytest.Pytester) -> None:
     pytester.makepyfile("""
-    import pymysql
     pytest_plugins = ["pytest_databases.docker.mariadb"]
 
     def test_1(mariadb_113_connection):
@@ -76,7 +75,6 @@ def test_2(mariadb_113_connection):
 
 def test_xdist_isolate_server(pytester: pytest.Pytester) -> None:
     pytester.makepyfile("""
-    import pymysql
     import pytest
     pytest_plugins = ["pytest_databases.docker.mariadb"]