@pi-r/mariadb 0.6.0 → 0.6.2

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/mariadb
 
+https://e-mc.readthedocs.io/en/latest/db/mariadb.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -30,12 +30,12 @@ function removePoolProperties(credential) {
             const attr = POOL_UNUSED[i];
             if (attr in credential) {
                 result || (result = { ...credential });
-                if (attr === 'ssl' && (0, types_1.isObject)(result[attr])) {
-                    result[attr] = true;
-                }
-                else {
+                if (attr !== 'ssl') {
                     delete result[attr];
                 }
+                else if ((0, types_1.isObject)(result.ssl)) {
+                    result[attr] = true;
+                }
             }
         }
         if (result) {
@@ -55,7 +55,11 @@ function isOkPacket(value) {
     const result = Array.isArray(value) ? value[0] : value;
     return !!result && !Array.isArray(result) && result.constructor.name === 'OkPacket';
 }
-const getPoolKey = (credential) => (credential.host || '') + '_' + (credential.port || '3306') + (credential.user || '') + '_' + (credential.password || '') + '_' + (credential.database || '') + '_' + (credential.rowsAsArray ? '1' : '0');
+function getPoolKey(credential) {
+    if ((credential.host || credential.socketPath) && credential.user) {
+        return JSON.stringify(removeUUIDKey(credential));
+    }
+}
 function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
     credential.host || (credential.host = auth.hostname);
@@ -89,7 +93,7 @@ function setCredential(item) {
         item.credential = credential;
     }
     const errors = [];
-    if (!credential.host) {
+    if (!credential.host && !credential.socketPath) {
         errors.push('host');
     }
     if (!credential.user) {
@@ -103,21 +107,22 @@ function setCredential(item) {
         return;
     }
     let username, password, pool;
-    if (typeof usePool === 'string' && (username = credential.user)) {
-        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-        if (pool) {
-            pool.add(item, password);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = credential.user) {
+            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+            if (pool) {
+                pool.add(item, password);
+                return;
+            }
+        }
+        if (!password) {
+            item.usePool = '';
             return;
         }
     }
-    const poolKey = getPoolKey(credential);
-    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
-        pool.add(item);
-        return;
-    }
     const config = this.getPoolConfig("mariadb" /* STRINGS.MODULE_NAME */, password);
     if (config) {
-        const { min, max, idle, timeout, socket_timeout } = config;
+        const { min, max, idle, queue_idle, timeout, socket_timeout } = config;
         if (min >= 0) {
             credential.minimumIdle ?? (credential.minimumIdle = min);
         }
@@ -127,6 +132,9 @@ function setCredential(item) {
         if (idle >= 0) {
             credential.idleTimeout ?? (credential.idleTimeout = idle);
         }
+        if (queue_idle > 0) {
+            credential.acquireTimeout ?? (credential.acquireTimeout = queue_idle);
+        }
         if (timeout > 0) {
             credential.connectTimeout ?? (credential.connectTimeout = timeout);
         }
@@ -134,6 +142,11 @@ function setCredential(item) {
             credential.socketTimeout ?? (credential.socketTimeout = socket_timeout);
         }
     }
+    const poolKey = getPoolKey(credential);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     new MariaDBPool(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
@@ -247,10 +260,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
-        const renewCache = ignoreCache === 0;
-        const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
+        const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
-        if ((caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache) && !streamRow) {
+        if (caching && ignoreCache !== true && !streamRow) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true);
             const result = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue);
             if (ignoreCache !== 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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.8.0",
-    "@e-mc/types": "^0.8.0",
+    "@e-mc/db": "^0.8.2",
+    "@e-mc/types": "^0.8.2",
     "mariadb": "^3.2.3"
   }
 }