@pi-r/mysql 0.5.6 → 0.5.8
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/client/index.js +5 -4
- package/package.json +3 -3
- package/client/pool.js +0 -61
package/client/index.js
CHANGED
|
@@ -140,9 +140,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
140
140
|
if (length === 0) {
|
|
141
141
|
return [];
|
|
142
142
|
}
|
|
143
|
-
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
143
|
+
let parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
|
|
144
144
|
if ((0, types_1.isPlainObject)(options)) {
|
|
145
|
-
({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
|
|
145
|
+
({ parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
|
|
146
146
|
}
|
|
147
147
|
else {
|
|
148
148
|
if (typeof options === 'string') {
|
|
@@ -362,11 +362,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
362
362
|
}
|
|
363
363
|
}
|
|
364
364
|
return this.processRows(batch, tasks, {
|
|
365
|
+
parallel,
|
|
366
|
+
errorAsEmpty,
|
|
365
367
|
disconnect: () => {
|
|
366
368
|
clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection", "mysql"], err, { type: 65536, fatal: false })));
|
|
367
369
|
pools.forEach(item => item.release());
|
|
368
|
-
}
|
|
369
|
-
parallel
|
|
370
|
+
}
|
|
370
371
|
}, outResult);
|
|
371
372
|
}
|
|
372
373
|
exports.executeBatchQuery = executeBatchQuery;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pi-r/mysql",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.8",
|
|
4
4
|
"description": "MySQL client driver for E-mc.",
|
|
5
5
|
"main": "client/index.js",
|
|
6
6
|
"types": "client/index.d.ts",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"homepage": "https://github.com/anpham6/pi-r#readme",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@e-mc/db": "^0.7.
|
|
25
|
-
"@e-mc/types": "^0.7.
|
|
24
|
+
"@e-mc/db": "^0.7.25",
|
|
25
|
+
"@e-mc/types": "^0.7.25",
|
|
26
26
|
"mysql2": "^3.10.3"
|
|
27
27
|
}
|
|
28
28
|
}
|
package/client/pool.js
DELETED
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
const types_1 = require("@e-mc/types");
|
|
3
|
-
const util_1 = require("@e-mc/db/util");
|
|
4
|
-
const DbPool = require('@e-mc/db/pool');
|
|
5
|
-
const POOL_ACTIVE = new WeakSet();
|
|
6
|
-
class MySQLPool extends DbPool {
|
|
7
|
-
static CACHE_UNUSED = ['connectTimeout', 'queueLimit', 'waitForConnections', 'connectionLimit', 'maxIdle', 'idleTimeout', 'enableKeepAlive', 'keepAliveInitialDelay', 'Promise'];
|
|
8
|
-
static CACHE_IGNORE = ['authPlugins', 'authSwitchHandler', 'stream', 'infileStreamFactory'];
|
|
9
|
-
static asString(credential) {
|
|
10
|
-
if ((credential.host || credential.socketPath) && credential.user) {
|
|
11
|
-
return JSON.stringify(this.removeUUIDKey(credential));
|
|
12
|
-
}
|
|
13
|
-
return super.asString(credential);
|
|
14
|
-
}
|
|
15
|
-
static sanitize(credential) {
|
|
16
|
-
if (!this.canCache(credential)) {
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
|
|
20
|
-
return credential;
|
|
21
|
-
}
|
|
22
|
-
const ssl = credential.ssl;
|
|
23
|
-
let result = super.sanitize(credential);
|
|
24
|
-
if ((0, types_1.isObject)(ssl)) {
|
|
25
|
-
if (result === credential) {
|
|
26
|
-
result = { ...credential };
|
|
27
|
-
}
|
|
28
|
-
const cert = ssl.cert;
|
|
29
|
-
if ((0, types_1.isString)(cert)) {
|
|
30
|
-
result.ssl = cert;
|
|
31
|
-
}
|
|
32
|
-
else if (Buffer.isBuffer(cert)) {
|
|
33
|
-
result.ssl = cert.toString('utf8');
|
|
34
|
-
}
|
|
35
|
-
else if ((0, types_1.isArray)(cert)) {
|
|
36
|
-
result.ssl = cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '');
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
result.ssl = "Unknown";
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
return result;
|
|
43
|
-
}
|
|
44
|
-
async getConnection(credential) {
|
|
45
|
-
if (credential) {
|
|
46
|
-
POOL_ACTIVE.add(credential);
|
|
47
|
-
}
|
|
48
|
-
return this.client.getConnection();
|
|
49
|
-
}
|
|
50
|
-
async close() {
|
|
51
|
-
return this.client.end();
|
|
52
|
-
}
|
|
53
|
-
isEmpty() {
|
|
54
|
-
const pool = this.client.pool;
|
|
55
|
-
return this.closed || (0, util_1.checkEmpty)(pool._allConnections) && (0, util_1.checkEmpty)(pool._connectionQueue);
|
|
56
|
-
}
|
|
57
|
-
get closed() {
|
|
58
|
-
return !!this.client.pool._closed;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
module.exports = MySQLPool;
|