@dyrected/db-mysql 2.5.30 → 2.5.33

package/dist/index.cjs

@@ -53,6 +53,7 @@ var MysqlAdapter = class {
   pool;
   config;
   initPromise = null;
+  inTransaction = false;
   constructor(config) {
     this.config = config;
     this.ensureInitialized().catch((err) => {
@@ -184,7 +185,7 @@ FIX INSTRUCTIONS:
     }
   }
   async find(args) {
-    await this.ensureTable(args.collection);
+    if (!this.inTransaction) await this.ensureTable(args.collection);
     const tableName = this.getTableName(args.collection);
     const limit = args.limit ?? 10;
     const page = args.page ?? 1;
@@ -237,9 +238,10 @@ FIX INSTRUCTIONS:
     };
   }
   async findOne(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?`, [params.id]);
+    const lock = this.inTransaction ? " FOR UPDATE" : "";
+    const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?${lock}`, [params.id]);
     const row = rows[0];
     if (!row) return null;
     return {
@@ -250,7 +252,7 @@ FIX INSTRUCTIONS:
     };
   }
   async create(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
@@ -274,7 +276,7 @@ FIX INSTRUCTIONS:
     return { id, ...data, createdAt: now, updatedAt: now };
   }
   async update(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
@@ -302,7 +304,7 @@ FIX INSTRUCTIONS:
     }
   }
   async delete(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     await this.query(`DELETE FROM \`${tableName}\` WHERE id = ?`, [params.id]);
   }
@@ -321,6 +323,25 @@ FIX INSTRUCTIONS:
     );
     return params.data;
   }
+  async transaction(callback) {
+    await this.ensureInitialized();
+    const connection = await this.pool.getConnection();
+    try {
+      await connection.beginTransaction();
+      const scoped = Object.create(this);
+      scoped.pool = connection;
+      scoped.initPromise = Promise.resolve();
+      scoped.inTransaction = true;
+      const result = await callback(scoped);
+      await connection.commit();
+      return result;
+    } catch (error) {
+      await connection.rollback();
+      throw error;
+    } finally {
+      connection.release();
+    }
+  }
   /** Gracefully close the connection pool. Call on process exit. */
   async close() {
     if (this.pool) {

package/dist/index.d.cts

@@ -14,6 +14,7 @@ declare class MysqlAdapter implements DatabaseAdapter {
     private pool;
     private config;
     private initPromise;
+    private inTransaction;
     constructor(config: MysqlAdapterConfig);
     private handleConnectionError;
     private ensureInitialized;
@@ -54,6 +55,7 @@ declare class MysqlAdapter implements DatabaseAdapter {
         slug: string;
         data: any;
     }): Promise<any>;
+    transaction<T>(callback: (db: DatabaseAdapter) => Promise<T>): Promise<T>;
     /** Gracefully close the connection pool. Call on process exit. */
     close(): Promise<void>;
 }

package/dist/index.d.ts

@@ -14,6 +14,7 @@ declare class MysqlAdapter implements DatabaseAdapter {
     private pool;
     private config;
     private initPromise;
+    private inTransaction;
     constructor(config: MysqlAdapterConfig);
     private handleConnectionError;
     private ensureInitialized;
@@ -54,6 +55,7 @@ declare class MysqlAdapter implements DatabaseAdapter {
         slug: string;
         data: any;
     }): Promise<any>;
+    transaction<T>(callback: (db: DatabaseAdapter) => Promise<T>): Promise<T>;
     /** Gracefully close the connection pool. Call on process exit. */
     close(): Promise<void>;
 }

package/dist/index.js

@@ -18,6 +18,7 @@ var MysqlAdapter = class {
   pool;
   config;
   initPromise = null;
+  inTransaction = false;
   constructor(config) {
     this.config = config;
     this.ensureInitialized().catch((err) => {
@@ -149,7 +150,7 @@ FIX INSTRUCTIONS:
     }
   }
   async find(args) {
-    await this.ensureTable(args.collection);
+    if (!this.inTransaction) await this.ensureTable(args.collection);
     const tableName = this.getTableName(args.collection);
     const limit = args.limit ?? 10;
     const page = args.page ?? 1;
@@ -202,9 +203,10 @@ FIX INSTRUCTIONS:
     };
   }
   async findOne(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?`, [params.id]);
+    const lock = this.inTransaction ? " FOR UPDATE" : "";
+    const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?${lock}`, [params.id]);
     const row = rows[0];
     if (!row) return null;
     return {
@@ -215,7 +217,7 @@ FIX INSTRUCTIONS:
     };
   }
   async create(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
@@ -239,7 +241,7 @@ FIX INSTRUCTIONS:
     return { id, ...data, createdAt: now, updatedAt: now };
   }
   async update(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
@@ -267,7 +269,7 @@ FIX INSTRUCTIONS:
     }
   }
   async delete(params) {
-    await this.ensureTable(params.collection);
+    if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     await this.query(`DELETE FROM \`${tableName}\` WHERE id = ?`, [params.id]);
   }
@@ -286,6 +288,25 @@ FIX INSTRUCTIONS:
     );
     return params.data;
   }
+  async transaction(callback) {
+    await this.ensureInitialized();
+    const connection = await this.pool.getConnection();
+    try {
+      await connection.beginTransaction();
+      const scoped = Object.create(this);
+      scoped.pool = connection;
+      scoped.initPromise = Promise.resolve();
+      scoped.inTransaction = true;
+      const result = await callback(scoped);
+      await connection.commit();
+      return result;
+    } catch (error) {
+      await connection.rollback();
+      throw error;
+    } finally {
+      connection.release();
+    }
+  }
   /** Gracefully close the connection pool. Call on process exit. */
   async close() {
     if (this.pool) {

package/package.json

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