Merge pull request #194 from Maxteabag/worktree-mariadb-pymysql-switch

Switch MariaDB driver to PyMySQL

Author: Maxteabag

README.md

@@ -278,7 +278,7 @@ Most of the time you can just run `sqlit` and connect. If a Python driver is mis
 | PostgreSQL / CockroachDB / Supabase | `psycopg2-binary`            | `pipx inject sqlit-tui psycopg2-binary`            | `python -m pip install psycopg2-binary`            |
 | SQL Server                          | `mssql-python`               | `pipx inject sqlit-tui mssql-python`               | `python -m pip install mssql-python`               |
 | MySQL                               | `PyMySQL`                    | `pipx inject sqlit-tui PyMySQL`                    | `python -m pip install PyMySQL`                    |
-| MariaDB                             | `mariadb`                    | `pipx inject sqlit-tui mariadb`                    | `python -m pip install mariadb`                    |
+| MariaDB                             | `PyMySQL`                    | `pipx inject sqlit-tui PyMySQL`                    | `python -m pip install PyMySQL`                    |
 | Oracle                              | `oracledb`                   | `pipx inject sqlit-tui oracledb`                   | `python -m pip install oracledb`                   |
 | DuckDB                              | `duckdb`                     | `pipx inject sqlit-tui duckdb`                     | `python -m pip install duckdb`                     |
 | ClickHouse                          | `clickhouse-connect`         | `pipx inject sqlit-tui clickhouse-connect`         | `python -m pip install clickhouse-connect`         |

aur/.SRCINFO

@@ -17,8 +17,7 @@ pkgbase = sqlit
 	depends = python-docker
 	optdepends = python-psycopg2: PostgreSQL, CockroachDB and Supabase support
 	optdepends = python-pyodbc: SQL Server support
-	optdepends = python-pymysql: MySQL support
-	optdepends = python-mariadb-connector: MariaDB support
+	optdepends = python-pymysql: MySQL and MariaDB support
 	optdepends = python-oracledb: Oracle support
 	optdepends = python-duckdb: DuckDB support
 	optdepends = python-clickhouse-connect: ClickHouse support

aur/PKGBUILD

@@ -20,8 +20,7 @@ depends=(
 optdepends=(
     'python-psycopg2: PostgreSQL, CockroachDB and Supabase support'
     'python-pyodbc: SQL Server support'
-    'python-pymysql: MySQL support'
-    'python-mariadb-connector: MariaDB support'
+    'python-pymysql: MySQL and MariaDB support'
     'python-oracledb: Oracle support'
     'python-duckdb: DuckDB support'
     'python-clickhouse-connect: ClickHouse support'

infra/docker/docker-compose.test.yml

@@ -289,6 +289,48 @@ services:
     tmpfs:
       - /var/lib/mysql
 
+  # MariaDB with TIS-620 charset (Thai) - for charset testing
+  mariadb-tis620:
+    image: mariadb:11
+    container_name: sqlit-test-mariadb-tis620
+    command: --character-set-server=tis620 --collation-server=tis620_thai_ci
+    environment:
+      MARIADB_ROOT_PASSWORD: "TestPassword123!"
+      MARIADB_USER: "testuser"
+      MARIADB_PASSWORD: "TestPassword123!"
+      MARIADB_DATABASE: "test_sqlit"
+    ports:
+      - "${MARIADB_TIS620_PORT:-3310}:3306"
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+      start_period: 30s
+    tmpfs:
+      - /var/lib/mysql
+
+  # MariaDB with Latin1 charset - for charset testing
+  mariadb-latin1:
+    image: mariadb:11
+    container_name: sqlit-test-mariadb-latin1
+    command: --character-set-server=latin1 --collation-server=latin1_swedish_ci
+    environment:
+      MARIADB_ROOT_PASSWORD: "TestPassword123!"
+      MARIADB_USER: "testuser"
+      MARIADB_PASSWORD: "TestPassword123!"
+      MARIADB_DATABASE: "test_sqlit"
+    ports:
+      - "${MARIADB_LATIN1_PORT:-3311}:3306"
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+      start_period: 30s
+    tmpfs:
+      - /var/lib/mysql
+
   cockroachdb:
     image: cockroachdb/cockroach:latest
     container_name: sqlit-test-cockroachdb

pyproject.toml

@@ -40,7 +40,6 @@ all = [
     "psycopg2-binary>=2.9.0",
     "mssql-python>=1.1.0",
     "PyMySQL>=1.1.0",
-    "mariadb>=1.1.0",
     "oracledb>=2.0.0",
     "ibm_db>=3.2.0",
     "hdbcli>=2.20.0",
@@ -68,7 +67,7 @@ postgres = ["psycopg2-binary>=2.9.0"]
 cockroachdb = ["psycopg2-binary>=2.9.0"]
 mssql = ["mssql-python>=1.1.0"]
 mysql = ["PyMySQL>=1.1.0"]
-mariadb = ["mariadb>=1.1.0"]
+mariadb = ["PyMySQL>=1.1.0"]
 oracle = ["oracledb>=2.0.0"]
 db2 = ["ibm_db>=3.2.0"]
 hana = ["hdbcli>=2.20.0"]
@@ -225,7 +224,6 @@ namespace_packages = true
 [[tool.mypy.overrides]]
 module = [
     "pymysql",
-    "mariadb",
     "oracledb",
     "duckdb",
     "clickhouse_connect",

sqlit/domains/connections/app/install_strategy.py

@@ -80,7 +80,6 @@ def _get_arch_package_name(package_name: str) -> str | None:
         "mssql-python": "python-mssql",
         "PyMySQL": "python-pymysql",
         "mysql-connector-python": "python-mysql-connector",
-        "mariadb": "python-mariadb-connector",
         "oracledb": "python-oracledb",
         "duckdb": "python-duckdb",
         "clickhouse-connect": "python-clickhouse-connect",