@pi-r/mariadb 0.5.0 → 0.6.1

package/client/index.js

@@ -7,10 +7,10 @@ const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
 const DbPool = require('@e-mc/db/pool');
 class MariaDBPool extends DbPool {
-    getConnection() {
+    async getConnection() {
         return this.client.getConnection();
     }
-    close() {
+    async close() {
         return this.client.end();
     }
     isEmpty() {
@@ -99,42 +99,42 @@ function setCredential(item) {
         throw (0, types_1.errorMessage)("mariadb" /* STRINGS.MODULE_NAME */, 'Not defined - ' + errors.join(' | '));
     }
     const usePool = item.usePool;
-    if (usePool) {
-        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);
-                return;
-            }
+    if (!usePool) {
+        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);
+            return;
         }
-        const poolKey = getPoolKey(credential);
-        if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const config = this.getPoolConfig("mariadb" /* STRINGS.MODULE_NAME */, password);
-            if (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(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+    }
+    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;
+        if (min >= 0) {
+            credential.minimumIdle ?? (credential.minimumIdle = min);
+        }
+        if (max > 0) {
+            credential.connectionLimit ?? (credential.connectionLimit = max);
         }
-        else {
-            pool.add(item);
+        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(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
 async function executeQuery(item, options) {
@@ -222,6 +222,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
         return client;
     };
+    if (this.host?.username) {
+        this.applyCommand(...batch);
+    }
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
@@ -244,10 +247,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) {
@@ -351,14 +353,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         disconnect: () => {
-            clients.forEach(item => item.end());
-            pools.forEach(item => item.release());
+            clients.forEach(async (item) => item.end());
+            pools.forEach(async (item) => item.release());
         },
         parallel
     }, outResult);
 }
 exports.executeBatchQuery = executeBatchQuery;
-function checkTimeout(value, limit = 0) {
+async function checkTimeout(value, limit = 0) {
     return DbPool.checkTimeout(POOL_STATE, value, limit);
 }
 exports.checkTimeout = checkTimeout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "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.7.0",
-    "@e-mc/types": "^0.7.0",
-    "mariadb": "^3.2.2"
+    "@e-mc/db": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
+    "mariadb": "^3.2.3"
   }
 }