@pi-r/mssql 0.6.1 → 0.6.3

package/README.md

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

package/client/index.js

@@ -111,6 +111,10 @@ function convertType(sql, type, value, options) {
     }
 }
 function getPoolKey(credential) {
+    const auth = credential.authentication?.options;
+    if (!credential.server || !(auth?.userName && auth.password)) {
+        return;
+    }
     const tls = credential.options?.cryptoCredentialsDetails;
     if (tls) {
         if (!(0, types_1.isObject)(tls)) {
@@ -118,16 +122,21 @@ function getPoolKey(credential) {
         }
         else if (tls.ca || tls.cert || tls.key) {
             credential = { ...credential };
+            if ('uuidKey' in credential) {
+                delete credential.uuidKey;
+            }
             credential.options = { ...credential.options };
             delete credential.options.cryptoCredentialsDetails;
             return JSON.stringify(credential) + '_tls';
         }
     }
+    if ('uuidKey' in credential) {
+        credential = { ...credential };
+        delete credential.uuidKey;
+    }
     return JSON.stringify(credential);
 }
-function isOutputParameters(params) {
-    return (0, types_1.isPlainObject)(params) && Object.keys(params).length === 2 && 'input' in params && 'output' in params;
-}
+const isOutputParameters = (params) => (0, types_1.isPlainObject)(params) && Object.keys(params).length === 2 && 'input' in params && 'output' in params;
 function setCredential(item) {
     let credential = this.getCredential(item), hostname, username, password, port, database;
     if (credential) {
@@ -195,18 +204,19 @@ function setCredential(item) {
     }
     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);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = authOptions.userName) {
+            [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("mssql" /* STRINGS.MODULE_NAME */, password);
     const poolConfig = (0, types_1.isPlainObject)(item.usePool) ? item.usePool : {};
     if (config) {
@@ -224,6 +234,11 @@ function setCredential(item) {
             poolConfig.acquireTimeout ?? (poolConfig.acquireTimeout = queue_idle);
         }
     }
+    const poolKey = getPoolKey(credential);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     new MSSQLPool(new TediousPool(poolConfig, credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
@@ -407,7 +422,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     if (isOutputParameters(params)) {
                         ({ input: params, output: paramsOutput } = params);
                     }
-                    convertParameters.call(request, tedious.TYPES, params, false);
+                    if (params) {
+                        convertParameters.call(request, tedious.TYPES, params, false);
+                    }
                     if (paramsOutput) {
                         convertParameters.call(request, tedious.TYPES, paramsOutput, true);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mssql",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "MSSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/mssql"
   },
   "keywords": [
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.1",
-    "@e-mc/types": "^0.8.1",
+    "@e-mc/db": "^0.8.3",
+    "@e-mc/types": "^0.8.3",
     "tedious": "^16.6.1",
     "tedious-connection-pool2": "^2.1.0"
   }

package/types/index.d.ts

@@ -2,9 +2,7 @@ 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> {
@@ -26,4 +24,4 @@ export interface MSSQLRequestParameterValue {
     options?: ParameterOptions;
 }
 
-export type MSSQLRequestParameters = Null<MSSQLRequestParameterValue[] | ObjectMap<Omit<MSSQLRequestParameterValue, "name">>>;
+export type MSSQLRequestParameters = MSSQLRequestParameterValue[] | Record<string, Omit<MSSQLRequestParameterValue, "name">> | null;