@dyrected/db-mysql 2.5.5 → 2.5.7

package/LICENSE.md

@@ -2,17 +2,17 @@ Business Source License 1.1
 
 Parameters
 
-Licensor:             Dyrected
-Licensed Work:        Dyrected
+Licensor: Dyrected
+Licensed Work: Dyrected
 Additional Use Grant: Commercial use is permitted as long as it is not used to provide a hosted or managed service that competes with Dyrected.
-Change Date:          2030-05-11
-Change License:       Apache License 2.0
+Change Date: 2030-05-18
+Change License: Apache License 2.0
 
 ---
 
 Business Source License 1.1
 
-License text copyright © 2024 MariaDB plc, All Rights Reserved. 
+License text copyright © 2024 MariaDB plc, All Rights Reserved.
 “Business Source License” is a trademark of MariaDB plc.
 
 ### Terms
@@ -31,7 +31,7 @@ Any use of the Licensed Work in violation of this License will automatically ter
 
 This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License).
 
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. 
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
 
 MariaDB hereby grants you permission to use this License’s text to license your works, and to refer to it using the trademark “Business Source License”, as long as you comply with the Covenants of Licensor below.
 
@@ -39,7 +39,7 @@ MariaDB hereby grants you permission to use this License’s text to license you
 
 In consideration of the right to use this License’s text and the “Business Source License” name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
 
-1. To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where “compatible” means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation. 
+1. To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where “compatible” means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
 
 2. To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text “None”.
 

package/dist/index.cjs

@@ -38,7 +38,74 @@ var import_core = require("@dyrected/core");
 var import_promise = __toESM(require("mysql2/promise"), 1);
 var MysqlAdapter = class {
   pool;
+  config;
+  initPromise = null;
   constructor(config) {
+    this.config = config;
+    this.ensureInitialized().catch((err) => {
+      if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
+        this.handleConnectionError(err);
+      }
+    });
+  }
+  handleConnectionError(err) {
+    if (err && (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL"))) {
+      const customMessage = `
+[dyrected/db-mysql] ERROR: MySQL connection failed with EADDRNOTAVAIL.
+--------------------------------------------------------------------------------
+This error often occurs when:
+1. 'localhost' is resolved to an IPv6 address (::1) but MySQL is only listening on IPv4 (127.0.0.1).
+2. The MySQL server is not running or is bound to a different port.
+
+FIX INSTRUCTIONS:
+- Try changing your host configuration in '.env' or config from 'localhost' to '127.0.0.1'.
+- Make sure your local MySQL service is active and running on the configured port.
+--------------------------------------------------------------------------------
+`;
+      console.error(customMessage);
+      throw new Error(`MySQL Connection Failed: EADDRNOTAVAIL. Hint: Try using '127.0.0.1' instead of 'localhost'. Original: ${err.message}`);
+    }
+    throw err;
+  }
+  async ensureInitialized() {
+    if (!this.initPromise) {
+      this.initPromise = this.initialize();
+    }
+    await this.initPromise;
+  }
+  async initialize() {
+    const config = this.config;
+    let dbName = config.database;
+    let serverConfig = null;
+    if (config.url) {
+      try {
+        const parsed = new URL(config.url);
+        dbName = parsed.pathname.replace(/^\//, "");
+        const serverUrl = `${parsed.protocol}//${parsed.username}:${parsed.password}@${parsed.host}`;
+        serverConfig = serverUrl;
+      } catch (err) {
+      }
+    } else {
+      serverConfig = {
+        host: config.host ?? "localhost",
+        port: config.port ?? 3306,
+        user: config.user,
+        password: config.password
+      };
+    }
+    if (dbName && serverConfig) {
+      try {
+        const tempConn = await import_promise.default.createConnection(serverConfig);
+        await tempConn.query(`CREATE DATABASE IF NOT EXISTS \`${dbName}\``);
+        await tempConn.end();
+        console.log(`[dyrected/db-mysql] Database "${dbName}" checked/created successfully`);
+      } catch (err) {
+        console.warn(`[dyrected/db-mysql] Auto-creation of database "${dbName}" skipped/failed:`, err.message);
+        if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
+          this.handleConnectionError(err);
+        }
+      }
+    }
     if (config.url) {
       this.pool = import_promise.default.createPool(config.url);
     } else {
@@ -48,26 +115,42 @@ var MysqlAdapter = class {
         user: config.user,
         password: config.password,
         database: config.database,
-        // Return dates as strings for consistency with other adapters
         dateStrings: true
       });
     }
-    this.initInternalTables().catch((err) => console.error("[dyrected/db-mysql] Failed to init internal tables:", err));
+    try {
+      await this.pool.query(`
+        CREATE TABLE IF NOT EXISTS dyrected_internal (
+          \`key\` VARCHAR(255) PRIMARY KEY,
+          value JSON NOT NULL
+        )
+      `);
+    } catch (err) {
+      this.handleConnectionError(err);
+    }
   }
-  async initInternalTables() {
-    await this.pool.query(`
-      CREATE TABLE IF NOT EXISTS dyrected_internal (
-        \`key\` VARCHAR(255) PRIMARY KEY,
-        value JSON NOT NULL
-      )
-    `);
+  async query(sql, params) {
+    await this.ensureInitialized();
+    try {
+      return await this.pool.query(sql, params);
+    } catch (err) {
+      this.handleConnectionError(err);
+    }
+  }
+  async execute(sql, params) {
+    await this.ensureInitialized();
+    try {
+      return await this.pool.execute(sql, params);
+    } catch (err) {
+      this.handleConnectionError(err);
+    }
   }
   getTableName(slug) {
     return `collection_${slug}`;
   }
   async ensureTable(slug, fields = []) {
     const tableName = this.getTableName(slug);
-    await this.pool.query(`
+    await this.query(`
       CREATE TABLE IF NOT EXISTS \`${tableName}\` (
         id VARCHAR(36) PRIMARY KEY,
         data JSON NOT NULL,
@@ -75,7 +158,7 @@ var MysqlAdapter = class {
         updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
       )
     `);
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     for (const field of fields) {
       if (field.promoted && !existingCols.includes(field.name)) {
@@ -83,7 +166,7 @@ var MysqlAdapter = class {
         let sqlType = "TEXT";
         if (field.type === "number") sqlType = "DECIMAL(19,4)";
         if (field.type === "boolean") sqlType = "TINYINT(1)";
-        await this.pool.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
+        await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
       }
     }
   }
@@ -93,7 +176,7 @@ var MysqlAdapter = class {
     const limit = args.limit ?? 10;
     const page = args.page ?? 1;
     const offset = (page - 1) * limit;
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     let whereSql = "";
     let whereParams = [];
@@ -113,12 +196,12 @@ var MysqlAdapter = class {
     }
     const rawSort = args.sort ?? "created_at DESC";
     const sort = rawSort.replace(/\bcreatedAt\b/g, "created_at").replace(/\bupdatedAt\b/g, "updated_at");
-    const [countRows] = await this.pool.query(
+    const [countRows] = await this.query(
       `SELECT COUNT(*) AS total FROM \`${tableName}\` ${whereSql}`,
       whereParams
     );
     const total = Number(countRows[0].total);
-    const [rows] = await this.pool.query(
+    const [rows] = await this.query(
       `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?`,
       [...whereParams, limit, offset]
     );
@@ -142,7 +225,7 @@ var MysqlAdapter = class {
   async findOne(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [rows] = await this.pool.query(`SELECT * FROM \`${tableName}\` WHERE id = ?`, [params.id]);
+    const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?`, [params.id]);
     const row = rows[0];
     if (!row) return null;
     return {
@@ -155,7 +238,7 @@ var MysqlAdapter = class {
   async create(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     const id = params.data.id ?? Math.random().toString(36).substring(7);
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
@@ -173,13 +256,13 @@ var MysqlAdapter = class {
     const colNames = ["id", "data", "created_at", "updated_at", ...Object.keys(promotedValues).map((k) => `\`${k}\``)];
     const placeholders = colNames.map(() => "?").join(", ");
     const values = [id, JSON.stringify(data), now, now, ...Object.values(promotedValues)];
-    await this.pool.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
+    await this.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
     return { id, ...data, createdAt: now, updatedAt: now };
   }
   async update(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     const existing = await this.findOne({ collection: params.collection, id: params.id });
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
@@ -196,7 +279,7 @@ var MysqlAdapter = class {
     }
     const setClauses = ["data = ?", "updated_at = ?", ...Object.keys(promotedValues).map((k) => `\`${k}\` = ?`)];
     const values = [JSON.stringify(merged), now, ...Object.values(promotedValues), params.id];
-    await this.pool.query(`UPDATE \`${tableName}\` SET ${setClauses.join(", ")} WHERE id = ?`, values);
+    await this.query(`UPDATE \`${tableName}\` SET ${setClauses.join(", ")} WHERE id = ?`, values);
     return { id: params.id, ...merged, createdAt: existing?.createdAt, updatedAt: now };
   }
   async sync(collections) {
@@ -207,10 +290,10 @@ var MysqlAdapter = class {
   async delete(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    await this.pool.query(`DELETE FROM \`${tableName}\` WHERE id = ?`, [params.id]);
+    await this.query(`DELETE FROM \`${tableName}\` WHERE id = ?`, [params.id]);
   }
   async getGlobal(params) {
-    const [rows] = await this.pool.query("SELECT value FROM dyrected_internal WHERE `key` = ?", [
+    const [rows] = await this.query("SELECT value FROM dyrected_internal WHERE `key` = ?", [
       `global_${params.slug}`
     ]);
     const row = rows[0];
@@ -218,7 +301,7 @@ var MysqlAdapter = class {
     return typeof row.value === "string" ? JSON.parse(row.value) : row.value;
   }
   async updateGlobal(params) {
-    await this.pool.execute(
+    await this.execute(
       "INSERT INTO dyrected_internal (`key`, value) VALUES (?, ?) ON DUPLICATE KEY UPDATE value = VALUES(value)",
       [`global_${params.slug}`, JSON.stringify(params.data)]
     );
@@ -226,7 +309,9 @@ var MysqlAdapter = class {
   }
   /** Gracefully close the connection pool. Call on process exit. */
   async close() {
-    await this.pool.end();
+    if (this.pool) {
+      await this.pool.end();
+    }
   }
 };
 var mysqlAdapter = (config) => new MysqlAdapter(config);

package/dist/index.d.cts

@@ -12,8 +12,14 @@ interface MysqlAdapterConfig {
 }
 declare class MysqlAdapter implements DatabaseAdapter {
     private pool;
+    private config;
+    private initPromise;
     constructor(config: MysqlAdapterConfig);
-    private initInternalTables;
+    private handleConnectionError;
+    private ensureInitialized;
+    private initialize;
+    private query;
+    execute(sql: string, params?: any[]): Promise<any>;
     private getTableName;
     private ensureTable;
     find(args: {

package/dist/index.d.ts

@@ -12,8 +12,14 @@ interface MysqlAdapterConfig {
 }
 declare class MysqlAdapter implements DatabaseAdapter {
     private pool;
+    private config;
+    private initPromise;
     constructor(config: MysqlAdapterConfig);
-    private initInternalTables;
+    private handleConnectionError;
+    private ensureInitialized;
+    private initialize;
+    private query;
+    execute(sql: string, params?: any[]): Promise<any>;
     private getTableName;
     private ensureTable;
     find(args: {

package/dist/index.js

@@ -3,7 +3,74 @@ import { parseSqlWhere } from "@dyrected/core";
 import mysql from "mysql2/promise";
 var MysqlAdapter = class {
   pool;
+  config;
+  initPromise = null;
   constructor(config) {
+    this.config = config;
+    this.ensureInitialized().catch((err) => {
+      if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
+        this.handleConnectionError(err);
+      }
+    });
+  }
+  handleConnectionError(err) {
+    if (err && (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL"))) {
+      const customMessage = `
+[dyrected/db-mysql] ERROR: MySQL connection failed with EADDRNOTAVAIL.
+--------------------------------------------------------------------------------
+This error often occurs when:
+1. 'localhost' is resolved to an IPv6 address (::1) but MySQL is only listening on IPv4 (127.0.0.1).
+2. The MySQL server is not running or is bound to a different port.
+
+FIX INSTRUCTIONS:
+- Try changing your host configuration in '.env' or config from 'localhost' to '127.0.0.1'.
+- Make sure your local MySQL service is active and running on the configured port.
+--------------------------------------------------------------------------------
+`;
+      console.error(customMessage);
+      throw new Error(`MySQL Connection Failed: EADDRNOTAVAIL. Hint: Try using '127.0.0.1' instead of 'localhost'. Original: ${err.message}`);
+    }
+    throw err;
+  }
+  async ensureInitialized() {
+    if (!this.initPromise) {
+      this.initPromise = this.initialize();
+    }
+    await this.initPromise;
+  }
+  async initialize() {
+    const config = this.config;
+    let dbName = config.database;
+    let serverConfig = null;
+    if (config.url) {
+      try {
+        const parsed = new URL(config.url);
+        dbName = parsed.pathname.replace(/^\//, "");
+        const serverUrl = `${parsed.protocol}//${parsed.username}:${parsed.password}@${parsed.host}`;
+        serverConfig = serverUrl;
+      } catch (err) {
+      }
+    } else {
+      serverConfig = {
+        host: config.host ?? "localhost",
+        port: config.port ?? 3306,
+        user: config.user,
+        password: config.password
+      };
+    }
+    if (dbName && serverConfig) {
+      try {
+        const tempConn = await mysql.createConnection(serverConfig);
+        await tempConn.query(`CREATE DATABASE IF NOT EXISTS \`${dbName}\``);
+        await tempConn.end();
+        console.log(`[dyrected/db-mysql] Database "${dbName}" checked/created successfully`);
+      } catch (err) {
+        console.warn(`[dyrected/db-mysql] Auto-creation of database "${dbName}" skipped/failed:`, err.message);
+        if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
+          this.handleConnectionError(err);
+        }
+      }
+    }
     if (config.url) {
       this.pool = mysql.createPool(config.url);
     } else {
@@ -13,26 +80,42 @@ var MysqlAdapter = class {
         user: config.user,
         password: config.password,
         database: config.database,
-        // Return dates as strings for consistency with other adapters
         dateStrings: true
       });
     }
-    this.initInternalTables().catch((err) => console.error("[dyrected/db-mysql] Failed to init internal tables:", err));
+    try {
+      await this.pool.query(`
+        CREATE TABLE IF NOT EXISTS dyrected_internal (
+          \`key\` VARCHAR(255) PRIMARY KEY,
+          value JSON NOT NULL
+        )
+      `);
+    } catch (err) {
+      this.handleConnectionError(err);
+    }
   }
-  async initInternalTables() {
-    await this.pool.query(`
-      CREATE TABLE IF NOT EXISTS dyrected_internal (
-        \`key\` VARCHAR(255) PRIMARY KEY,
-        value JSON NOT NULL
-      )
-    `);
+  async query(sql, params) {
+    await this.ensureInitialized();
+    try {
+      return await this.pool.query(sql, params);
+    } catch (err) {
+      this.handleConnectionError(err);
+    }
+  }
+  async execute(sql, params) {
+    await this.ensureInitialized();
+    try {
+      return await this.pool.execute(sql, params);
+    } catch (err) {
+      this.handleConnectionError(err);
+    }
   }
   getTableName(slug) {
     return `collection_${slug}`;
   }
   async ensureTable(slug, fields = []) {
     const tableName = this.getTableName(slug);
-    await this.pool.query(`
+    await this.query(`
       CREATE TABLE IF NOT EXISTS \`${tableName}\` (
         id VARCHAR(36) PRIMARY KEY,
         data JSON NOT NULL,
@@ -40,7 +123,7 @@ var MysqlAdapter = class {
         updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
       )
     `);
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     for (const field of fields) {
       if (field.promoted && !existingCols.includes(field.name)) {
@@ -48,7 +131,7 @@ var MysqlAdapter = class {
         let sqlType = "TEXT";
         if (field.type === "number") sqlType = "DECIMAL(19,4)";
         if (field.type === "boolean") sqlType = "TINYINT(1)";
-        await this.pool.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
+        await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
       }
     }
   }
@@ -58,7 +141,7 @@ var MysqlAdapter = class {
     const limit = args.limit ?? 10;
     const page = args.page ?? 1;
     const offset = (page - 1) * limit;
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     let whereSql = "";
     let whereParams = [];
@@ -78,12 +161,12 @@ var MysqlAdapter = class {
     }
     const rawSort = args.sort ?? "created_at DESC";
     const sort = rawSort.replace(/\bcreatedAt\b/g, "created_at").replace(/\bupdatedAt\b/g, "updated_at");
-    const [countRows] = await this.pool.query(
+    const [countRows] = await this.query(
       `SELECT COUNT(*) AS total FROM \`${tableName}\` ${whereSql}`,
       whereParams
     );
     const total = Number(countRows[0].total);
-    const [rows] = await this.pool.query(
+    const [rows] = await this.query(
       `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?`,
       [...whereParams, limit, offset]
     );
@@ -107,7 +190,7 @@ var MysqlAdapter = class {
   async findOne(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [rows] = await this.pool.query(`SELECT * FROM \`${tableName}\` WHERE id = ?`, [params.id]);
+    const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?`, [params.id]);
     const row = rows[0];
     if (!row) return null;
     return {
@@ -120,7 +203,7 @@ var MysqlAdapter = class {
   async create(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     const id = params.data.id ?? Math.random().toString(36).substring(7);
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
@@ -138,13 +221,13 @@ var MysqlAdapter = class {
     const colNames = ["id", "data", "created_at", "updated_at", ...Object.keys(promotedValues).map((k) => `\`${k}\``)];
     const placeholders = colNames.map(() => "?").join(", ");
     const values = [id, JSON.stringify(data), now, now, ...Object.values(promotedValues)];
-    await this.pool.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
+    await this.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
     return { id, ...data, createdAt: now, updatedAt: now };
   }
   async update(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.pool.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
     const existing = await this.findOne({ collection: params.collection, id: params.id });
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
@@ -161,7 +244,7 @@ var MysqlAdapter = class {
     }
     const setClauses = ["data = ?", "updated_at = ?", ...Object.keys(promotedValues).map((k) => `\`${k}\` = ?`)];
     const values = [JSON.stringify(merged), now, ...Object.values(promotedValues), params.id];
-    await this.pool.query(`UPDATE \`${tableName}\` SET ${setClauses.join(", ")} WHERE id = ?`, values);
+    await this.query(`UPDATE \`${tableName}\` SET ${setClauses.join(", ")} WHERE id = ?`, values);
     return { id: params.id, ...merged, createdAt: existing?.createdAt, updatedAt: now };
   }
   async sync(collections) {
@@ -172,10 +255,10 @@ var MysqlAdapter = class {
   async delete(params) {
     await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    await this.pool.query(`DELETE FROM \`${tableName}\` WHERE id = ?`, [params.id]);
+    await this.query(`DELETE FROM \`${tableName}\` WHERE id = ?`, [params.id]);
   }
   async getGlobal(params) {
-    const [rows] = await this.pool.query("SELECT value FROM dyrected_internal WHERE `key` = ?", [
+    const [rows] = await this.query("SELECT value FROM dyrected_internal WHERE `key` = ?", [
       `global_${params.slug}`
     ]);
     const row = rows[0];
@@ -183,7 +266,7 @@ var MysqlAdapter = class {
     return typeof row.value === "string" ? JSON.parse(row.value) : row.value;
   }
   async updateGlobal(params) {
-    await this.pool.execute(
+    await this.execute(
       "INSERT INTO dyrected_internal (`key`, value) VALUES (?, ?) ON DUPLICATE KEY UPDATE value = VALUES(value)",
       [`global_${params.slug}`, JSON.stringify(params.data)]
     );
@@ -191,7 +274,9 @@ var MysqlAdapter = class {
   }
   /** Gracefully close the connection pool. Call on process exit. */
   async close() {
-    await this.pool.end();
+    if (this.pool) {
+      await this.pool.end();
+    }
   }
 };
 var mysqlAdapter = (config) => new MysqlAdapter(config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/db-mysql",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "description": "MySQL adapter for Dyrected CMS",
   "type": "module",
   "files": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "mysql2": "^3.22.3",
-    "@dyrected/core": "^2.5.5"
+    "@dyrected/core": "^2.5.7"
   },
   "devDependencies": {
     "tsup": "^8.0.0",