@pi-r/mssql 0.3.7 → 0.3.9

package/client/index.js

@@ -238,9 +238,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
+    let parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
-        ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
+        ({ parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
     }
     else {
         if (typeof options === 'string') {
@@ -492,11 +492,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
     }
     return this.processRows(batch, tasks, {
+        parallel,
+        errorAsEmpty,
         disconnect: () => {
             clients.forEach(item => item.close());
             pools.forEach(item => item.release());
-        },
-        parallel
+        }
     }, outResult);
 }
 exports.executeBatchQuery = executeBatchQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mssql",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "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.6.16",
-    "@e-mc/types": "^0.6.16",
+    "@e-mc/db": "^0.6.21",
+    "@e-mc/types": "^0.6.21",
     "tedious": "^16.7.1",
     "tedious-connection-pool2": "^2.1.0"
   }

package/client/pool.js

@@ -1,63 +0,0 @@
-"use strict";
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/db/util");
-const DbPool = require('@e-mc/db/pool');
-class MSSQLPool extends DbPool {
-    static asString(credential) {
-        const auth = credential.authentication?.options;
-        if (!credential.server || !(auth?.userName && auth.password)) {
-            return super.asString(credential);
-        }
-        const options = credential.options;
-        let tls;
-        if (options && (tls = options.cryptoCredentialsDetails)) {
-            if (!(0, types_1.isObject)(tls)) {
-                delete options.cryptoCredentialsDetails;
-            }
-            else if (tls.ca || tls.cert || tls.key) {
-                credential = { ...credential };
-                if ('uuidKey' in credential) {
-                    delete credential.uuidKey;
-                }
-                credential.options = { ...options };
-                delete credential.options.cryptoCredentialsDetails;
-                return JSON.stringify(credential) + '_tls';
-            }
-        }
-        if ('uuidKey' in credential) {
-            credential = { ...credential };
-            delete credential.uuidKey;
-        }
-        return JSON.stringify(credential);
-    }
-    async getConnection() {
-        return new Promise((resolve, reject) => {
-            this.client.acquire((err, connection) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve(connection);
-                }
-            });
-        });
-    }
-    async close() {
-        return new Promise((resolve, reject) => {
-            try {
-                this.client.drain();
-                resolve();
-            }
-            catch (err) {
-                reject(err);
-            }
-        });
-    }
-    isEmpty() {
-        return this.closed || (0, util_1.checkEmpty)(this.client.connections) && (0, util_1.checkEmpty)(this.client.waiting);
-    }
-    get closed() {
-        return !!this.client.drained;
-    }
-}
-module.exports = MSSQLPool;

package/types/pool.d.ts

@@ -1,67 +0,0 @@
-import type { Connection, ConnectionConfiguration } from 'tedious';
-
-import type * as EventEmitter from 'events';
-
-declare class Pool extends EventEmitter {
-    /**
-     * Connection Pool constructor
-     * @param poolConfig the pool configuration
-     * @param connectionConfig the connection configuration
-     */
-    constructor(poolConfig: Pool.PoolConfig, connectionConfig: ConnectionConfiguration);
-
-    /**
-     * acquires a connection from the pool
-     * @param callback invoked when the connection is retrieved and ready
-     */
-    acquire(callback: (err: Error, connection: Pool.PooledConnection) => void): void;
-
-    /**
-     * closes opened connections
-     */
-    drain(): void;
-}
-
-declare namespace Pool {
-
-    export class PooledConnection extends Connection {
-        /**
-         * If the connection is issued from a connection pool returns the connection to the pool.
-         */
-        release(): void;
-    }
-
-    export interface PoolConfig {
-        /**
-         * Minimum concurrent connections
-         */
-        min?: number | undefined;
-
-        /**
-         * Maximum concurrent connections
-         */
-        max?: number | undefined;
-
-        /**
-         * Defines if logging is activated
-         */
-        log?: boolean | undefined;
-
-        /**
-         * Idle timeout
-         */
-        idleTimeout?: number | undefined;
-
-        /**
-         * Retry delay
-         */
-        retryDelay?: number | undefined;
-
-        /**
-         * Acquire timeout
-         */
-        acquireTimeout?: number | undefined;
-    }
-}
-
-export = Pool;