@pi-r/mariadb 0.2.4 → 0.5.0

package/client/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
+const mariadb = require("mariadb");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -109,18 +110,26 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mariadb" /* STRINGS.PACKAGE_NAME */);
             const config = this.getPoolConfig("mariadb" /* STRINGS.MODULE_NAME */, password);
             if (config) {
-                const { max, idle } = config;
+                const { min, max, idle, timeout, socket_timeout } = config;
+                if (min >= 0) {
+                    credential.minimumIdle ?? (credential.minimumIdle = min);
+                }
                 if (max > 0) {
                     credential.connectionLimit ?? (credential.connectionLimit = max);
                 }
                 if (idle >= 0) {
                     credential.idleTimeout ?? (credential.idleTimeout = idle);
                 }
+                if (timeout > 0) {
+                    credential.connectTimeout ?? (credential.connectTimeout = timeout);
+                }
+                if (socket_timeout > 0) {
+                    credential.socketTimeout ?? (credential.socketTimeout = socket_timeout);
+                }
             }
-            new MariaDBPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MariaDBPool(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -137,7 +146,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mariadb" /* STRINGS.PACKAGE_NAME */);
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -203,7 +211,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = await db.createConnection(removeUUIDKey(mariaDBCredential || credential)));
+            clients.push(client = await mariadb.createConnection(removeUUIDKey(mariaDBCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.2.4",
+  "version": "0.5.0",
   "description": "MariaDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "mariadb": "^3.2.0"
+    "@e-mc/db": "^0.7.0",
+    "@e-mc/types": "^0.7.0",
+    "mariadb": "^3.2.2"
   }
 }