Move mysql to BasicDatabaseClient

apps/studio/src/lib/db/client.ts

@@ -156,7 +156,7 @@ export interface IDbConnectionDatabase {
   connecting: boolean,
 }
 
-export class DBConnection {
+export class DBConnection implements DatabaseClient {
   connectionType = this.server.config.client
   constructor (private server: IDbConnectionServer, private database: IDbConnectionDatabase) {}
   supportedFeatures = supportedFeatures.bind(null, this.server, this.database)
@@ -236,6 +236,8 @@ export class DBConnection {
   duplicateTable = bindAsync.bind(null, 'duplicateTable', this.server, this.database)
   duplicateTableSql = bind.bind(null, 'duplicateTableSql', this.server, this.database)
 
+  wrapIdentifier = wrap.bind(null, this.database)
+
   async currentDatabase() {
     return this.database.database
   }

apps/studio/src/lib/db/clients/index.ts

@@ -1,12 +1,14 @@
 // Copyright (c) 2015 The SQLECTRON Team
 
 import mysql from './mysql';
+import mariadb from './mariadb';
 import postgresql from './postgresql';
 import sqlserver from './sqlserver';
 import sqlite from './sqlite';
 import cassandra from './cassandra';
 import bigquery from './bigquery.js';
 import firebird from './firebird';
+import { DBClientFactories } from '../types';
 
 
 export function findClient(key: string): Client | undefined {
@@ -153,15 +155,17 @@ export const CLIENTS: ClientConfig[] = [
 ];
 
 
-export default {
+const factories: DBClientFactories = {
   mysql,
   postgresql,
   sqlserver,
   sqlite,
   cassandra,
   redshift: postgresql,
-  mariadb: mysql,
+  mariadb,
   cockroachdb: postgresql,
   bigquery,
   firebird,
 };
+
+export default factories;

apps/studio/src/lib/db/clients/mariadb.ts

@@ -0,0 +1,36 @@
+import { IDbConnectionDatabase, IDbConnectionServer } from "../types";
+import { MysqlClient } from "./mysql";
+
+export class MariaDBClient extends MysqlClient {
+  resolveDefault(defaultValue: string) {
+    // adapted from https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/pull/998/files
+    if (!defaultValue) return null;
+
+    if (defaultValue.toString().toLowerCase() === "'null'") {
+      return null;
+    }
+
+    if (
+      defaultValue.startsWith("'") &&
+      defaultValue.endsWith("'") &&
+      defaultValue.length >= 2
+    ) {
+      // MariaDb escapes all single quotes with two single quotes in default value strings, even if they are
+      // escaped with backslashes in the original `CREATE TABLE` statement.
+      return defaultValue
+        .substring(1, defaultValue.length - 1)
+        .replaceAll("''", "'");
+    }
+
+    return defaultValue;
+  }
+}
+
+export default async function (
+  server: IDbConnectionServer,
+  database: IDbConnectionDatabase
+) {
+  const client = new MariaDBClient(server, database);
+  await client.connect();
+  return client;
+}