@holo-js/db-mysql 0.3.16 → 0.3.17

package/dist/index.d.ts

@@ -27,9 +27,7 @@ declare class MySQLAdapter<TConfig extends PoolOptions = PoolOptions> implements
     private readonly createPoolInstance?;
     private readonly config;
     private connected;
-    private transactionClient?;
-    private leasedTransactionClient;
-    private readonly transactionScope;
+    private readonly transactionClients;
     constructor(options?: MySQLAdapterOptions<TConfig>);
     initialize(): Promise<void>;
     isDatabaseMissingError(error: unknown): boolean;
@@ -47,10 +45,6 @@ declare class MySQLAdapter<TConfig extends PoolOptions = PoolOptions> implements
     releaseSavepoint(name: string): Promise<void>;
     private getQueryable;
     ensureDatabaseExists(): Promise<void>;
-    private leaseTransactionClient;
-    private requireTransactionClient;
-    private releaseTransactionClient;
-    private releaseScopedTransaction;
     private normalizeSavepointName;
 }
 declare function createMySQLAdapter<TConfig extends PoolOptions = PoolOptions>(options?: MySQLAdapterOptions<TConfig>): MySQLAdapter<TConfig>;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 // src/index.ts
-import { AsyncLocalStorage } from "async_hooks";
+import { holoRuntimeInternals } from "@holo-js/db";
 import mysql from "mysql2/promise";
 var TransactionError = class extends Error {
 };
@@ -63,6 +63,15 @@ function wrapMySQLPool(pool) {
     end: rawPool.end.bind(rawPool)
   };
 }
+function createNativeMySQLPool(config) {
+  const pool = mysql.createPool({ ...config, timezone: config.timezone ?? "Z" });
+  if (!config.timezone || config.timezone === "Z") {
+    pool.pool.on("connection", (connection) => {
+      connection.query("SET time_zone = '+00:00'");
+    });
+  }
+  return wrapMySQLPool(pool);
+}
 function isMySQLDatabaseMissing(error) {
   return typeof error === "object" && error !== null && ("code" in error && error.code === "ER_BAD_DB_ERROR" || "errno" in error && error.errno === 1049);
 }
@@ -73,15 +82,27 @@ var MySQLAdapter = class {
   createPoolInstance;
   config;
   connected;
-  transactionClient;
-  leasedTransactionClient = false;
-  transactionScope = new AsyncLocalStorage();
+  transactionClients;
   constructor(options = {}) {
     this.directClient = options.client;
     this.pool = options.pool;
-    this.createPoolInstance = options.createPool ?? (options.client || options.pool ? void 0 : (config) => wrapMySQLPool(mysql.createPool(config)));
+    this.createPoolInstance = options.createPool ?? (options.client || options.pool ? void 0 : createNativeMySQLPool);
     this.config = options.config ?? (options.uri ? { uri: options.uri } : {});
     this.connected = !!(options.client || options.pool);
+    this.transactionClients = new holoRuntimeInternals.PooledTransactionClients(
+      "MySQL",
+      this.directClient,
+      async () => {
+        await this.initialize();
+        if (this.directClient) {
+          return this.directClient;
+        }
+        if (!this.pool) {
+          throw new TransactionError("MySQL adapter is not initialized with a pool or client.");
+        }
+        return this.pool.getConnection();
+      }
+    );
   }
   async initialize() {
     if (this.connected) {
@@ -99,11 +120,7 @@ var MySQLAdapter = class {
     if (!this.connected) {
       return;
     }
-    if (this.transactionClient && this.leasedTransactionClient) {
-      this.transactionClient.release?.();
-      this.transactionClient = void 0;
-      this.leasedTransactionClient = false;
-    }
+    this.transactionClients.disconnect();
     if (this.pool) {
       await this.pool.end();
       this.pool = void 0;
@@ -115,30 +132,8 @@ var MySQLAdapter = class {
   isConnected() {
     return this.connected;
   }
-  async runWithTransactionScope(callback) {
-    const active = this.transactionScope.getStore();
-    if (active) {
-      return callback();
-    }
-    await this.initialize();
-    if (this.directClient) {
-      return this.transactionScope.run({
-        client: this.directClient
-      }, callback);
-    }
-    if (!this.pool) {
-      throw new TransactionError("MySQL adapter is not initialized with a pool or client.");
-    }
-    const state = {
-      client: await this.pool.getConnection()
-    };
-    return this.transactionScope.run(state, async () => {
-      try {
-        return await callback();
-      } finally {
-        this.releaseScopedTransaction(state);
-      }
-    });
+  runWithTransactionScope(callback) {
+    return this.transactionClients.run(callback);
   }
   async query(sql, bindings = []) {
     const queryable = await this.getQueryable();
@@ -162,35 +157,32 @@ var MySQLAdapter = class {
     };
   }
   async beginTransaction() {
-    const client = await this.leaseTransactionClient();
+    const client = await this.transactionClients.lease();
     await client.query("START TRANSACTION", []);
   }
   async commit() {
-    const client = this.requireTransactionClient();
+    const client = this.transactionClients.require();
     await client.query("COMMIT", []);
-    this.releaseTransactionClient();
+    this.transactionClients.release();
   }
   async rollback() {
-    const client = this.requireTransactionClient();
+    const client = this.transactionClients.require();
     await client.query("ROLLBACK", []);
-    this.releaseTransactionClient();
+    this.transactionClients.release();
   }
   async createSavepoint(name) {
-    await this.requireTransactionClient().query(`SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
+    await this.transactionClients.require().query(`SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
   }
   async rollbackToSavepoint(name) {
-    await this.requireTransactionClient().query(`ROLLBACK TO SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
+    await this.transactionClients.require().query(`ROLLBACK TO SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
   }
   async releaseSavepoint(name) {
-    await this.requireTransactionClient().query(`RELEASE SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
+    await this.transactionClients.require().query(`RELEASE SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
   }
   async getQueryable() {
-    const scoped = this.transactionScope.getStore();
-    if (scoped) {
-      return scoped.client;
-    }
-    if (this.transactionClient) {
-      return this.transactionClient;
+    const active = this.transactionClients.current;
+    if (active) {
+      return active;
     }
     await this.initialize();
     if (this.directClient) {
@@ -228,47 +220,6 @@ var MySQLAdapter = class {
       await bootstrapPool.end();
     }
   }
-  async leaseTransactionClient() {
-    const scoped = this.transactionScope.getStore();
-    if (scoped) {
-      return scoped.client;
-    }
-    if (this.transactionClient) {
-      return this.transactionClient;
-    }
-    await this.initialize();
-    if (this.directClient) {
-      this.transactionClient = this.directClient;
-      this.leasedTransactionClient = false;
-      return this.transactionClient;
-    }
-    if (!this.pool) {
-      throw new TransactionError("MySQL adapter is not initialized with a pool or client.");
-    }
-    this.transactionClient = await this.pool.getConnection();
-    this.leasedTransactionClient = true;
-    return this.transactionClient;
-  }
-  requireTransactionClient() {
-    const scoped = this.transactionScope.getStore();
-    if (scoped) {
-      return scoped.client;
-    }
-    if (!this.transactionClient) {
-      throw new TransactionError("No active MySQL transaction client is available.");
-    }
-    return this.transactionClient;
-  }
-  releaseTransactionClient() {
-    if (this.transactionClient && this.leasedTransactionClient) {
-      this.transactionClient.release?.();
-    }
-    this.transactionClient = void 0;
-    this.leasedTransactionClient = false;
-  }
-  releaseScopedTransaction(state) {
-    state.client.release?.();
-  }
   normalizeSavepointName(name) {
     if (!/^[A-Z_]\w*$/i.test(name)) {
       throw new TransactionError(`Invalid savepoint name "${name}".`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/db-mysql",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "Holo-JS Framework - MySQL database adapter",
   "type": "module",
   "license": "MIT",
@@ -24,13 +24,13 @@
     "test:integration": "HOLO_MYSQL_INTEGRATION=1 vitest --run tests/mysql.test.ts"
   },
   "peerDependencies": {
-    "@holo-js/db": "^0.3.16"
+    "@holo-js/db": "^0.3.17"
   },
   "dependencies": {
     "mysql2": "^3.17.1"
   },
   "devDependencies": {
-    "@holo-js/db": "^0.3.16",
+    "@holo-js/db": "^0.3.17",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
     "vitest": "^4.1.5"