@pi-r/mysql 0.3.7 → 0.3.9
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
|
@@ -137,9 +137,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
137
137
|
if (length === 0) {
|
|
138
138
|
return [];
|
|
139
139
|
}
|
|
140
|
-
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
140
|
+
let parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
|
|
141
141
|
if ((0, types_1.isPlainObject)(options)) {
|
|
142
|
-
({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
|
|
142
|
+
({ parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
|
|
143
143
|
}
|
|
144
144
|
else {
|
|
145
145
|
if (typeof options === 'string') {
|
|
@@ -359,11 +359,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
359
359
|
}
|
|
360
360
|
}
|
|
361
361
|
return this.processRows(batch, tasks, {
|
|
362
|
+
parallel,
|
|
363
|
+
errorAsEmpty,
|
|
362
364
|
disconnect: () => {
|
|
363
365
|
clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection", "mysql"], err, { type: 65536, fatal: false })));
|
|
364
366
|
pools.forEach(item => item.release());
|
|
365
|
-
}
|
|
366
|
-
parallel
|
|
367
|
+
}
|
|
367
368
|
}, outResult);
|
|
368
369
|
}
|
|
369
370
|
exports.executeBatchQuery = executeBatchQuery;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pi-r/mysql",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.9",
|
|
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.6.
|
|
25
|
-
"@e-mc/types": "^0.6.
|
|
24
|
+
"@e-mc/db": "^0.6.21",
|
|
25
|
+
"@e-mc/types": "^0.6.21",
|
|
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;
|