@pi-r/mssql 0.5.0 → 0.6.1

package/client/index.js

@@ -8,7 +8,7 @@ const Db = require("@e-mc/db");
 const TediousPool = require('tedious-connection-pool2');
 const DbPool = require('@e-mc/db/pool');
 class MSSQLPool extends DbPool {
-    getConnection() {
+    async getConnection() {
         return new Promise((resolve, reject) => {
             this.client.acquire((err, connection) => {
                 if (err) {
@@ -20,7 +20,7 @@ class MSSQLPool extends DbPool {
             });
         });
     }
-    close() {
+    async close() {
         return new Promise((resolve, reject) => {
             try {
                 this.client.drain();
@@ -190,41 +190,41 @@ function setCredential(item) {
         }
     }
     const usePool = item.usePool;
-    if (usePool) {
-        let pool;
-        password = undefined;
-        if (typeof usePool === 'string' && (username = authOptions.userName)) {
-            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-            if (pool) {
-                pool.add(item, password);
-                return;
-            }
+    if (!usePool) {
+        return;
+    }
+    let pool;
+    password = undefined;
+    if (typeof usePool === 'string' && (username = authOptions.userName)) {
+        [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("mssql" /* STRINGS.MODULE_NAME */, password);
-            const poolConfig = (0, types_1.isPlainObject)(item.usePool) ? item.usePool : {};
-            if (config) {
-                const { min, max, idle, queue_idle } = config;
-                if (min >= 0) {
-                    poolConfig.min ?? (poolConfig.min = min);
-                }
-                if (max > 0) {
-                    poolConfig.max ?? (poolConfig.max = max);
-                }
-                if (idle >= 0) {
-                    poolConfig.idleTimeout ?? (poolConfig.idleTimeout = idle);
-                }
-                if (queue_idle >= 0) {
-                    poolConfig.acquireTimeout ?? (poolConfig.acquireTimeout = queue_idle);
-                }
-            }
-            new MSSQLPool(new TediousPool(poolConfig, 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("mssql" /* STRINGS.MODULE_NAME */, password);
+    const poolConfig = (0, types_1.isPlainObject)(item.usePool) ? item.usePool : {};
+    if (config) {
+        const { min, max, idle, queue_idle } = config;
+        if (min >= 0) {
+            poolConfig.min ?? (poolConfig.min = min);
         }
-        else {
-            pool.add(item);
+        if (max > 0) {
+            poolConfig.max ?? (poolConfig.max = max);
+        }
+        if (idle >= 0) {
+            poolConfig.idleTimeout ?? (poolConfig.idleTimeout = idle);
+        }
+        if (queue_idle >= 0) {
+            poolConfig.acquireTimeout ?? (poolConfig.acquireTimeout = queue_idle);
         }
     }
+    new MSSQLPool(new TediousPool(poolConfig, credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
 async function executeQuery(item, options) {
@@ -321,6 +321,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, ignoreCache } = item;
@@ -343,10 +346,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
         const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mssql" /* STRINGS.MODULE_NAME */, 'options', null, credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
-        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 params = item.params, 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);
             if (ignoreCache !== 1) {
                 const result = this.getQueryResult(source, credential, queryString, cacheValue);
@@ -498,7 +500,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }, 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/mssql",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "MSSQL 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",
+    "@e-mc/db": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
     "tedious": "^16.6.1",
     "tedious-connection-pool2": "^2.1.0"
   }

package/types/index.d.ts

@@ -2,7 +2,9 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 
+// @ts-ignore
 import type { ConnectionConfig, ParameterOptions, TediousType, TediousTypes } from 'tedious';
+// @ts-ignore
 import type { PoolConfig } from 'tedious-connection-pool';
 
 export interface MSSQLDataSource extends DbDataSource<string, unknown, unknown, string | MSSQLCredential, string | PoolConfig>, ExecuteAction<MSSQLRequestParameters | MSSQLRequestWithOutputParameters> {