@mikro-orm/mysql 7.2.0-dev.1 → 7.2.0-dev.10

package/MySqlConnection.d.ts

@@ -1,10 +1,13 @@
 import { type ControlledTransaction, MysqlDialect } from 'kysely';
-import { type PoolOptions } from 'mysql2';
+import { type Pool, type PoolOptions } from 'mysql2';
 import { type Routine, type Transaction } from '@mikro-orm/core';
 import { AbstractSqlConnection, type TransactionEventBroadcaster } from '@mikro-orm/sql';
 /** MySQL database connection using the `mysql2` driver. */
 export declare class MySqlConnection extends AbstractSqlConnection {
+    #private;
     createKyselyDialect(overrides: PoolOptions): Promise<MysqlDialect>;
+    /** Returns the `mysql2` connection pool backing this connection. */
+    getNativeClient(): Promise<Pool>;
     mapOptions(overrides: PoolOptions): PoolOptions;
     callRoutine<T>(routine: Routine, args?: Record<string, unknown>, ctx?: Transaction): Promise<T>;
     commit(ctx: ControlledTransaction<any, any>, eventBroadcaster?: TransactionEventBroadcaster): Promise<void>;

package/MySqlConnection.js

@@ -1,14 +1,21 @@
-import { MysqlDialect } from 'kysely';
-import { createPool } from 'mysql2';
+import { MysqlDialect, } from 'kysely';
+import { createConnection, createPool } from 'mysql2';
 import { Utils, AbstractSqlConnection, } from '@mikro-orm/sql';
 /** MySQL database connection using the `mysql2` driver. */
 export class MySqlConnection extends AbstractSqlConnection {
+    // Kysely sends `cancel query`/`kill session` over this connection rather than over the pool, so an
+    // abort doesn't have to wait for an idle pool connection — or, inside a transaction, for the very
+    // query it is meant to cancel. Postgres gets one from its pool by default, mysql2 does not.
+    static #controlConnection = createConnection;
+    #pool;
     async createKyselyDialect(overrides) {
         const options = this.mapOptions(overrides);
         const password = options.password;
         if (typeof password === 'function') {
             const initialPassword = await password();
             const innerPool = createPool({ ...options, password: initialPassword });
+            // the wrapper below is a kysely-shaped shim, so expose the real mysql2 pool
+            this.#pool = innerPool;
             // mysql2 reads pool.config.connectionConfig.password when creating new physical
             // connections, so updating it before getConnection() ensures fresh tokens are used.
             // Existing idle connections are already authenticated and unaffected, so we skip
@@ -33,16 +40,24 @@ export class MySqlConnection extends AbstractSqlConnection {
             };
             return new MysqlDialect({
                 pool,
+                controlConnection: MySqlConnection.#controlConnection,
                 onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
                 onReserveConnection: this.options.onReserveConnection ?? this.config.get('onReserveConnection'),
             });
         }
+        this.#pool = createPool(options);
         return new MysqlDialect({
-            pool: createPool(options),
+            pool: this.#pool,
+            controlConnection: MySqlConnection.#controlConnection,
             onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
             onReserveConnection: this.options.onReserveConnection ?? this.config.get('onReserveConnection'),
         });
     }
+    /** Returns the `mysql2` connection pool backing this connection. */
+    async getNativeClient() {
+        await this.ensureConnection();
+        return this.requireNativeClient(this.#pool);
+    }
     mapOptions(overrides) {
         const ret = { ...this.getConnectionOptions() };
         const pool = this.config.get('pool');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mysql",
-  "version": "7.2.0-dev.1",
+  "version": "7.2.0-dev.10",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",
@@ -47,16 +47,16 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.0-dev.1",
-    "kysely": "0.29.4",
-    "mysql2": "3.23.1",
+    "@mikro-orm/sql": "7.2.0-dev.10",
+    "kysely": "0.29.5",
+    "mysql2": "3.23.3",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.7"
+    "@mikro-orm/core": "^7.1.11"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.0-dev.1"
+    "@mikro-orm/core": "7.2.0-dev.10"
   },
   "engines": {
     "node": ">= 22.17.0"