@mikro-orm/mysql 7.1.0-dev.3 → 7.1.0-dev.31

package/MySqlConnection.js

@@ -11,12 +11,18 @@ export class MySqlConnection extends AbstractSqlConnection {
             const innerPool = createPool({ ...options, password: initialPassword });
             // 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.
+            // Existing idle connections are already authenticated and unaffected, so we skip
+            // the callback when the pool has a free connection to reuse.
             const pool = {
                 getConnection(cb) {
+                    const inner = innerPool;
+                    if ((inner._freeConnections?.length ?? 0) > 0) {
+                        innerPool.getConnection(cb);
+                        return;
+                    }
                     Promise.resolve(password())
                         .then(pw => {
-                        innerPool.config.connectionConfig.password = pw;
+                        inner.config.connectionConfig.password = pw;
                         innerPool.getConnection(cb);
                     })
                         .catch(err => cb(err, undefined));
@@ -40,6 +46,17 @@ export class MySqlConnection extends AbstractSqlConnection {
         const pool = this.config.get('pool');
         ret.connectionLimit = pool?.max;
         ret.idleTimeout = pool?.idleTimeoutMillis;
+        // mysql2 only runs idle cleanup when `maxIdle < connectionLimit`; its default has
+        // them equal, so `idleTimeout` alone is a no-op. When the user opts into idle
+        // cleanup via `pool.idleTimeoutMillis`, default `maxIdle` to `pool.min ?? 0` so
+        // idle connections actually drain. A misconfigured `pool.min > pool.max` is
+        // clamped below `pool.max` so cleanup still runs. Explicit `driverOptions.maxIdle`
+        // still wins because `overrides` is merged in last.
+        if (pool?.idleTimeoutMillis != null) {
+            const min = pool.min ?? 0;
+            const max = pool.max;
+            ret.maxIdle = max != null && min > max ? Math.max(0, max - 1) : min;
+        }
         if (this.config.get('multipleStatements')) {
             ret.multipleStatements = this.config.get('multipleStatements');
         }

package/MySqlMikroORM.d.ts

@@ -1,5 +1,5 @@
-import { type AnyEntity, type EntityClass, type EntitySchema, MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
-import type { SqlEntityManager } from '@mikro-orm/sql';
+import { type AnyEntity, type EntityClass, type EntitySchema, type MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import { SqlMikroORM, type SqlEntityManager } from '@mikro-orm/sql';
 import { MySqlDriver } from './MySqlDriver.js';
 /** Configuration options for the MySQL driver. */
 export type MySqlOptions<EM extends SqlEntityManager<MySqlDriver> = SqlEntityManager<MySqlDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> = Partial<Options<MySqlDriver, EM, Entities>>;
@@ -8,7 +8,7 @@ export declare function defineMySqlConfig<EM extends SqlEntityManager<MySqlDrive
 /**
  * @inheritDoc
  */
-export declare class MySqlMikroORM<EM extends SqlEntityManager<MySqlDriver> = SqlEntityManager<MySqlDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends MikroORM<MySqlDriver, EM, Entities> {
+export declare class MySqlMikroORM<EM extends SqlEntityManager<MySqlDriver> = SqlEntityManager<MySqlDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends SqlMikroORM<MySqlDriver, EM, Entities> {
     /**
      * @inheritDoc
      */

package/MySqlMikroORM.js

@@ -1,4 +1,5 @@
-import { defineConfig, MikroORM, } from '@mikro-orm/core';
+import { defineConfig, } from '@mikro-orm/core';
+import { SqlMikroORM } from '@mikro-orm/sql';
 import { MySqlDriver } from './MySqlDriver.js';
 /** Creates a type-safe configuration object for the MySQL driver. */
 export function defineMySqlConfig(options) {
@@ -7,7 +8,7 @@ export function defineMySqlConfig(options) {
 /**
  * @inheritDoc
  */
-export class MySqlMikroORM extends MikroORM {
+export class MySqlMikroORM extends SqlMikroORM {
     /**
      * @inheritDoc
      */

package/README.md

@@ -2,7 +2,7 @@
   <a href="https://mikro-orm.io"><img src="https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/logo-readme.svg?sanitize=true" alt="MikroORM" /></a>
 </h1>
 
-TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite (including libSQL), MSSQL and Oracle databases.
+TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL (including CockroachDB and PGlite), SQLite (including libSQL), MSSQL and Oracle databases.
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
@@ -19,6 +19,7 @@ Install a driver package for your database:
 
 ```sh
 npm install @mikro-orm/postgresql   # PostgreSQL
+npm install @mikro-orm/pglite       # PGlite (embedded PostgreSQL in WASM)
 npm install @mikro-orm/mysql        # MySQL
 npm install @mikro-orm/mariadb      # MariaDB
 npm install @mikro-orm/sqlite       # SQLite

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mysql",
-  "version": "7.1.0-dev.3",
+  "version": "7.1.0-dev.31",
   "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.1.0-dev.3",
-    "kysely": "0.28.16",
-    "mysql2": "3.22.1",
+    "@mikro-orm/sql": "7.1.0-dev.31",
+    "kysely": "0.29.0",
+    "mysql2": "3.22.3",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.0.11"
+    "@mikro-orm/core": "^7.0.15"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.3"
+    "@mikro-orm/core": "7.1.0-dev.31"
   },
   "engines": {
     "node": ">= 22.17.0"