@pi-r/mariadb 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 +3 -4
- package/package.json +1 -1
package/client/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
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 mariadb = require("mariadb");
|
|
4
5
|
const util_1 = require("@e-mc/db/util");
|
|
5
6
|
const types_1 = require("@e-mc/types");
|
|
6
7
|
const Db = require("@e-mc/db");
|
|
@@ -111,7 +112,6 @@ function setCredential(item) {
|
|
|
111
112
|
}
|
|
112
113
|
const poolKey = getPoolKey(credential);
|
|
113
114
|
if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
|
|
114
|
-
const { createPool } = require("mariadb");
|
|
115
115
|
const config = this.getPoolConfig("mariadb", password);
|
|
116
116
|
if (config) {
|
|
117
117
|
const { max, idle } = config;
|
|
@@ -122,7 +122,7 @@ function setCredential(item) {
|
|
|
122
122
|
(_b = credential.idleTimeout) !== null && _b !== void 0 ? _b : (credential.idleTimeout = idle);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
|
-
new MariaDBPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
125
|
+
new MariaDBPool(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
126
126
|
}
|
|
127
127
|
else {
|
|
128
128
|
pool.add(item);
|
|
@@ -139,7 +139,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
139
139
|
if (length === 0) {
|
|
140
140
|
return [];
|
|
141
141
|
}
|
|
142
|
-
const db = require("mariadb");
|
|
143
142
|
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
144
143
|
if ((0, types_1.isPlainObject)(options)) {
|
|
145
144
|
({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
|
|
@@ -205,7 +204,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
205
204
|
}
|
|
206
205
|
}
|
|
207
206
|
if (!client) {
|
|
208
|
-
clients.push(client = await
|
|
207
|
+
clients.push(client = await mariadb.createConnection(removeUUIDKey(mariaDBCredential || credential)));
|
|
209
208
|
}
|
|
210
209
|
if (connectOnce) {
|
|
211
210
|
if (!parallel) {
|