@pi-r/mysql 0.3.6 → 0.3.7
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 -6
- package/package.json +1 -1
package/client/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
|
|
4
|
+
const main = require("mysql2");
|
|
5
|
+
const mysql = require("mysql2/promise");
|
|
4
6
|
const util_1 = require("@e-mc/db/util");
|
|
5
7
|
const types_1 = require("@e-mc/types");
|
|
6
8
|
const Db = require("@e-mc/db");
|
|
@@ -105,7 +107,6 @@ function setCredential(item) {
|
|
|
105
107
|
}
|
|
106
108
|
const poolKey = getPoolKey(credential);
|
|
107
109
|
if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
|
|
108
|
-
const { createPool } = require("mysql2/promise");
|
|
109
110
|
const config = this.getPoolConfig("mysql", password);
|
|
110
111
|
if (config) {
|
|
111
112
|
const { max, idle, queue_max } = config;
|
|
@@ -119,7 +120,7 @@ function setCredential(item) {
|
|
|
119
120
|
(_d = credential.queueLimit) !== null && _d !== void 0 ? _d : (credential.queueLimit = queue_max);
|
|
120
121
|
}
|
|
121
122
|
}
|
|
122
|
-
new MySQLPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
123
|
+
new MySQLPool(mysql.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
123
124
|
}
|
|
124
125
|
else {
|
|
125
126
|
pool.add(item);
|
|
@@ -136,7 +137,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
136
137
|
if (length === 0) {
|
|
137
138
|
return [];
|
|
138
139
|
}
|
|
139
|
-
const db = require("mysql2/promise");
|
|
140
140
|
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
141
141
|
if ((0, types_1.isPlainObject)(options)) {
|
|
142
142
|
({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
|
|
@@ -202,7 +202,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
202
202
|
}
|
|
203
203
|
}
|
|
204
204
|
if (!client) {
|
|
205
|
-
clients.push(client = await
|
|
205
|
+
clients.push(client = await mysql.createConnection(removeUUIDKey(mysqlCredential || credential)));
|
|
206
206
|
}
|
|
207
207
|
if (connectOnce) {
|
|
208
208
|
if (!parallel) {
|
|
@@ -282,8 +282,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
282
282
|
if (streamRow) {
|
|
283
283
|
const rows = [];
|
|
284
284
|
const processRow = typeof streamRow === 'function' && streamRow;
|
|
285
|
-
const
|
|
286
|
-
const client = mysql2Client || createConnection(removeUUIDKey(mysql2Credential || credential));
|
|
285
|
+
const client = mysql2Client || main.createConnection(removeUUIDKey(mysql2Credential || credential));
|
|
287
286
|
clients.push(client);
|
|
288
287
|
if (connectOnce) {
|
|
289
288
|
if (!parallel) {
|