test: run tests against the mariadb adapter

.github/workflows/test-query-compiler.yml

@@ -68,6 +68,12 @@ jobs:
             should_fail_tests_list: query-compiler/query-engine-tests-todo/neon/fail
             relation_load_strategy: '["join", "query"]'
 
+          - name: mariadb
+            setup_task: dev-mariadb-qc
+            ignored_tests_list: query-compiler/query-engine-tests-todo/mariadb/skip
+            should_fail_tests_list: query-compiler/query-engine-tests-todo/mariadb/fail
+            relation_load_strategy: '["query"]'
+
     name: ${{ matrix.adapter.name }}
 
     uses: ./.github/workflows/test-query-compiler-template.yml

.github/workflows/test-query-engine.yml

@@ -231,6 +231,8 @@ jobs:
             setup_task: 'dev-better-sqlite3'
           - name: 'mssql (wasm)'
             setup_task: 'dev-mssql-wasm'
+          - name: 'mariadb (wasm)'
+            setup_task: 'dev-mariadb-wasm'
     name: ${{ matrix.adapter.name }}
     uses: ./.github/workflows/test-driver-adapters-template.yml
     with:

Makefile

@@ -461,6 +461,19 @@ test-planetscale-qc: dev-planetscale-qc test-qe-st
 test-driver-adapter-planetscale: test-planetscale-js
 test-driver-adapter-planetscale-wasm: test-planetscale-wasm
 
+dev-mariadb-wasm: start-mysql_8 build-qe-wasm build-driver-adapters-kit-qe
+	cp $(CONFIG_PATH)/mariadb-wasm $(CONFIG_FILE)
+
+test-mariadb-wasm: dev-mariadb-wasm test-qe-st
+
+dev-mariadb-qc: start-mysql_8 build-qc-wasm build-driver-adapters-kit-qc
+	cp $(CONFIG_PATH)/mariadb-qc $(CONFIG_FILE)
+
+test-mariadb-qc: dev-mariadb-qc test-qe-st
+
+test-driver-adapter-mariadb: test-mariadb-js
+test-driver-adapter-mariadb-wasm: test-mariadb-wasm
+
 ######################
 # Local dev commands #
 ######################

libs/driver-adapters/executor/package.json

@@ -31,6 +31,7 @@
     "@prisma/adapter-neon": "workspace:*",
     "@prisma/adapter-pg": "workspace:*",
     "@prisma/adapter-planetscale": "workspace:*",
+    "@prisma/adapter-mariadb": "workspace:*",
     "@prisma/bundled-js-drivers": "workspace:*",
     "@prisma/client-engine-runtime": "workspace:*",
     "@prisma/schema-engine-wasm": "../../../schema-engine/schema-engine-wasm/pkg",

libs/driver-adapters/executor/src/driver-adapters-manager/mariadb.ts

@@ -0,0 +1,57 @@
+import { PrismaMariaDb } from '@prisma/adapter-mariadb'
+import type {
+  SqlDriverAdapter,
+  SqlDriverAdapterFactory,
+} from '@prisma/driver-adapter-utils'
+import type {
+  DriverAdaptersManager,
+  SetupDriverAdaptersInput,
+} from './index.js'
+import type { DriverAdapterTag, EnvForAdapter } from '../types/index.js'
+
+const TAG = 'mariadb' as const satisfies DriverAdapterTag
+type TAG = typeof TAG
+
+export class MariaDbManager implements DriverAdaptersManager {
+  #factory: SqlDriverAdapterFactory
+  #adapter?: SqlDriverAdapter
+
+  private constructor(
+    private env: EnvForAdapter<TAG>,
+    { url }: SetupDriverAdaptersInput,
+  ) {
+    this.#factory = new PrismaMariaDb(mariadbOptions(url))
+  }
+
+  static async setup(env: EnvForAdapter<TAG>, input: SetupDriverAdaptersInput) {
+    return new MariaDbManager(env, input)
+  }
+
+  factory() {
+    return this.#factory
+  }
+
+  async connect() {
+    this.#adapter = await this.#factory.connect()
+    return this.#adapter
+  }
+
+  async teardown() {
+    await this.#adapter?.dispose()
+  }
+}
+
+function mariadbOptions(urlStr: string) {
+  const url = new URL(urlStr)
+  const { username: user, password, hostname: host, port } = url
+  const database = url.pathname && url.pathname.slice(1)
+
+  return {
+    user,
+    password,
+    database,
+    host,
+    port: Number(port),
+    connectionLimit: 4,
+  }
+}

libs/driver-adapters/executor/src/setup.ts

@@ -11,6 +11,7 @@ import { PlanetScaleManager } from './driver-adapters-manager/planetscale.js'
 import { D1Manager } from './driver-adapters-manager/d1.js'
 import { BetterSQLite3Manager } from './driver-adapters-manager/better-sqlite3.js'
 import { MssqlManager } from './driver-adapters-manager/mssql.js'
+import { MariaDbManager } from './driver-adapters-manager/mariadb.js'
 
 export async function setupDriverAdaptersManager(
   env: Env,
@@ -45,5 +46,9 @@ export async function setupDriverAdaptersManager(
       { DRIVER_ADAPTER: 'mssql' },
       async (env) => await MssqlManager.setup(env, input),
     )
+    .with(
+      { DRIVER_ADAPTER: 'mariadb' },
+      async (env) => await MariaDbManager.setup(env, input),
+    )
     .exhaustive()
 }

libs/driver-adapters/executor/src/types/env.ts

@@ -53,6 +53,7 @@ export const Env = S.extend(
         'd1',
         'better-sqlite3',
         'mssql',
+        'mariadb',
       ),
     }),
   ),

libs/driver-adapters/pnpm-workspace.yaml

@@ -6,6 +6,7 @@ packages:
   - '../../../prisma/packages/adapter-neon'
   - '../../../prisma/packages/adapter-pg'
   - '../../../prisma/packages/adapter-planetscale'
+  - '../../../prisma/packages/adapter-mariadb'
   - '../../../prisma/packages/bundled-js-drivers'
   - '../../../prisma/packages/client-engine-runtime'
   - '../../../prisma/packages/debug'

query-compiler/query-engine-tests-todo/mariadb/fail/query

@@ -0,0 +1,6 @@
+new::interactive_tx::interactive_tx::batch_queries_failure
+new::regressions::prisma_7434::not_in_chunking::not_in_batch_filter
+queries::aggregation::group_by::aggregation_group_by::group_by_ordering_sum_aggregation
+queries::chunking::chunking::order_by_aggregation_should_fail
+queries::filters::self_relation_regression::sr_regression::all_categories
+writes::nested_mutations::already_converted::nested_connect_inside_update::connect_inside_update::p1_c1req_rel_child_idempotent

query-engine/connector-test-kit-rs/qe-setup/src/driver_adapters.rs

@@ -23,6 +23,9 @@ pub enum DriverAdapter {
 
     #[serde(rename = "mssql")]
     Mssql,
+
+    #[serde(rename = "mariadb")]
+    MariaDb,
 }
 
 impl From<String> for DriverAdapter {

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/logs.rs

@@ -8,6 +8,7 @@ use query_engine_tests::*;
         Postgres("neon.js.wasm", "pg.js.wasm"),
         Sqlite("libsql.js.wasm", "cfd1", "react-native", "better-sqlite3"),
         Sqlserver("mssql.js.wasm"),
+        Mysql("mariadb.js.wasm")
     )
 )]
 mod logs {

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/metrics.rs

@@ -6,7 +6,8 @@ use query_engine_tests::test_suite;
         Vitess("planetscale.js.wasm"),
         Postgres("neon.js.wasm", "pg.js.wasm"),
         Sqlite("libsql.js.wasm", "cfd1", "react-native", "better-sqlite3"),
-        Sqlserver("mssql.js.wasm")
+        Sqlserver("mssql.js.wasm"),
+        Mysql("mariadb.js.wasm")
     )
 )]
 mod metrics {

query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/filters/json.rs

@@ -215,7 +215,7 @@ mod json {
             Vitess("planetscale.js.wasm"),
             Postgres("neon.js.wasm", "pg.js.wasm"),
             Sqlite("libsql.js.wasm", "cfd1", "better-sqlite3"),
-            MySQL(5.6)
+            MySQL(5.6, "mariadb.js.wasm"),
         )
     )]
     async fn nested_not_shorthand(runner: Runner) -> TestResult<()> {

query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs

@@ -137,13 +137,17 @@ pub(crate) fn connection_string(
         ConnectorVersion::MySql(v) => match v {
             Some(MySqlVersion::V5_6) if is_ci => format!("mysql://root:prisma@test-db-mysql-5-6:3306/{database}"),
             Some(MySqlVersion::V5_7) if is_ci => format!("mysql://root:prisma@test-db-mysql-5-7:3306/{database}"),
-            Some(MySqlVersion::V8) if is_ci => format!("mysql://root:prisma@test-db-mysql-8:3306/{database}"),
+            Some(MySqlVersion::V8 | MySqlVersion::MariaDbJsWasm) if is_ci => {
+                format!("mysql://root:prisma@test-db-mysql-8:3306/{database}")
+            }
             Some(MySqlVersion::MariaDb) if is_ci => {
                 format!("mysql://root:prisma@test-db-mysql-mariadb:3306/{database}")
             }
             Some(MySqlVersion::V5_6) => format!("mysql://root:prisma@127.0.0.1:3309/{database}"),
             Some(MySqlVersion::V5_7) => format!("mysql://root:prisma@127.0.0.1:3306/{database}"),
-            Some(MySqlVersion::V8) => format!("mysql://root:prisma@127.0.0.1:3307/{database}"),
+            Some(MySqlVersion::V8 | MySqlVersion::MariaDbJsWasm) => {
+                format!("mysql://root:prisma@127.0.0.1:3307/{database}")
+            }
             Some(MySqlVersion::MariaDb) => {
                 format!("mysql://root:prisma@127.0.0.1:3308/{database}")
             }
@@ -331,6 +335,7 @@ impl ConnectorVersion {
                 | Self::Sqlite(Some(SqliteVersion::CloudflareD1))
                 | Self::Sqlite(Some(SqliteVersion::BetterSQLite3))
                 | Self::SqlServer(Some(SqlServerVersion::MssqlJsWasm))
+                | Self::MySql(Some(MySqlVersion::MariaDbJsWasm))
         )
     }
 }

query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mysql.rs

@@ -34,6 +34,7 @@ pub enum MySqlVersion {
     V5_7,
     V8,
     MariaDb,
+    MariaDbJsWasm,
 }
 
 impl TryFrom<&str> for MySqlVersion {
@@ -45,6 +46,7 @@ impl TryFrom<&str> for MySqlVersion {
             "5.7" => Self::V5_7,
             "8" => Self::V8,
             "mariadb" => Self::MariaDb,
+            "mariadb.js.wasm" => Self::MariaDbJsWasm,
             _ => return Err(TestError::parse_error(format!("Unknown MySQL version `{s}`"))),
         };
 
@@ -59,6 +61,7 @@ impl Display for MySqlVersion {
             MySqlVersion::V5_7 => f.write_str("5.7"),
             MySqlVersion::V8 => f.write_str("8"),
             MySqlVersion::MariaDb => f.write_str("mariadb"),
+            MySqlVersion::MariaDbJsWasm => f.write_str("mariadb.js.wasm"),
         }
     }
 }

query-engine/connector-test-kit-rs/test-configs/mariadb-qc

@@ -0,0 +1,6 @@
+{
+    "connector": "mysql",
+    "version": "mariadb.js.wasm",
+    "driver_adapter": "mariadb",
+    "external_test_executor": "QueryCompiler"
+}

query-engine/connector-test-kit-rs/test-configs/mariadb-wasm

@@ -0,0 +1,6 @@
+{
+    "connector": "mysql",
+    "version": "mariadb.js.wasm",
+    "driver_adapter": "mariadb",
+    "external_test_executor": "Wasm"
+}

query-engine/query-builders/sql-query-builder/src/lib.rs

@@ -242,7 +242,7 @@ impl<'a, V: Visitor<'a>> QueryBuilder for SqlQueryBuilder<'a, V> {
                 None
             };
 
-            let last_insert_id_field = id_selection.scalars().find(|sf| sf.is_auto_generated_int_id()).cloned();
+            let last_insert_id_field = id_selection.scalars().find(|sf| sf.is_autoincrement()).cloned();
 
             // Return all arguments that are a part of the primary identifier as values to merge
             // into the created record.