@mikro-orm/mysql 7.1.0-dev.28 → 7.1.0-dev.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/MySqlConnection.js +11 -0
- package/package.json +3 -3
package/MySqlConnection.js
CHANGED
|
@@ -46,6 +46,17 @@ export class MySqlConnection extends AbstractSqlConnection {
|
|
|
46
46
|
const pool = this.config.get('pool');
|
|
47
47
|
ret.connectionLimit = pool?.max;
|
|
48
48
|
ret.idleTimeout = pool?.idleTimeoutMillis;
|
|
49
|
+
// mysql2 only runs idle cleanup when `maxIdle < connectionLimit`; its default has
|
|
50
|
+
// them equal, so `idleTimeout` alone is a no-op. When the user opts into idle
|
|
51
|
+
// cleanup via `pool.idleTimeoutMillis`, default `maxIdle` to `pool.min ?? 0` so
|
|
52
|
+
// idle connections actually drain. A misconfigured `pool.min > pool.max` is
|
|
53
|
+
// clamped below `pool.max` so cleanup still runs. Explicit `driverOptions.maxIdle`
|
|
54
|
+
// still wins because `overrides` is merged in last.
|
|
55
|
+
if (pool?.idleTimeoutMillis != null) {
|
|
56
|
+
const min = pool.min ?? 0;
|
|
57
|
+
const max = pool.max;
|
|
58
|
+
ret.maxIdle = max != null && min > max ? Math.max(0, max - 1) : min;
|
|
59
|
+
}
|
|
49
60
|
if (this.config.get('multipleStatements')) {
|
|
50
61
|
ret.multipleStatements = this.config.get('multipleStatements');
|
|
51
62
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/mysql",
|
|
3
|
-
"version": "7.1.0-dev.
|
|
3
|
+
"version": "7.1.0-dev.29",
|
|
4
4
|
"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.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"data-mapper",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"copy": "node ../../scripts/copy.mjs"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@mikro-orm/sql": "7.1.0-dev.
|
|
50
|
+
"@mikro-orm/sql": "7.1.0-dev.29",
|
|
51
51
|
"kysely": "0.28.17",
|
|
52
52
|
"mysql2": "3.22.3",
|
|
53
53
|
"sqlstring": "2.3.3"
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@mikro-orm/core": "^7.0.14"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"@mikro-orm/core": "7.1.0-dev.
|
|
59
|
+
"@mikro-orm/core": "7.1.0-dev.29"
|
|
60
60
|
},
|
|
61
61
|
"engines": {
|
|
62
62
|
"node": ">= 22.17.0"
|