@pi-r/mssql 0.3.1 → 0.3.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Lisa Mishima
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,7 @@
-### @pi-r/mssql
+# @pi-r/mssql
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.d.ts

@@ -1,7 +1,7 @@
-import type { MSSQLDataSource } from '@e-mc/types/lib/db';
-
 import type { IDbSourceClient } from '@e-mc/db/types';
 
+import type { MSSQLDataSource } from '../types';
+
 declare const MSSQL: IDbSourceClient<MSSQLDataSource>;
 
 export = MSSQL;

package/client/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
+const tedious = require("tedious");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/db/util");
 const Db = require("@e-mc/db");
+const TediousPool = require('tedious-connection-pool2');
 const DbPool = require('@e-mc/db/pool');
 class MSSQLPool extends DbPool {
     getConnection() {
@@ -170,7 +172,7 @@ function setCredential(item) {
         errors.push('authentication.options.password');
     }
     if (errors.length) {
-        throw (0, types_1.errorMessage)("mssql" /* STRINGS.MODULE_NAME */, 'Not defined - ' + errors.join(' | '));
+        throw (0, types_1.errorMessage)("mssql", 'Not defined - ' + errors.join(' | '));
     }
     const options = credential.options;
     if (options) {
@@ -200,8 +202,7 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const Pool = require("tedious-connection-pool2" /* STRINGS.PACKAGE_POOL */);
-            const config = this.getPoolConfig("mssql" /* STRINGS.MODULE_NAME */, password);
+            const config = this.getPoolConfig("mssql", password);
             const poolConfig = (0, types_1.isPlainObject)(item.usePool) ? item.usePool : {};
             if (config) {
                 const { min, max, idle, queue_idle } = config;
@@ -218,7 +219,7 @@ function setCredential(item) {
                     poolConfig.acquireTimeout ?? (poolConfig.acquireTimeout = queue_idle);
                 }
             }
-            new MSSQLPool(new Pool(poolConfig, credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MSSQLPool(new TediousPool(poolConfig, credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -235,7 +236,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("tedious" /* STRINGS.PACKAGE_NAME */);
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -256,17 +256,17 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("mssql" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("mssql", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     const pools = [];
     let mssqlPool, mssqlClient, mssqlCredential, onceCredential = connectOnce ? batch[0].credential : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         let client;
         if (mssqlPool) {
             pools.push(client = await mssqlPool.getConnection());
-            item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+            item.transactionState &= ~64;
             return client;
         }
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential), ...connectOnce ? [item, batch[0]] : [item]);
@@ -301,7 +301,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         if (!client) {
             clients.push(client = await new Promise((resolve, reject) => {
-                const sql = new db.Connection(mssqlCredential || credential);
+                const sql = new tedious.Connection(mssqlCredential || credential);
                 sql.connect(err => {
                     if (err) {
                         reject(err);
@@ -318,14 +318,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             mssqlCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         const { source, query, ignoreCache } = item;
         let credential = mssqlCredential || onceCredential, error;
-        if (!credential && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials" /* ERR_DB.CREDENTIALS */)) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */))) {
+        if (!credential && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -341,8 +341,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        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;
+        item.transactionState = 1;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mssql", 'options', null, credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
         const renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
         let params = item.params, queryString = '';
@@ -357,7 +357,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = result;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     continue;
                 }
                 if (!ignoreCache && outCacheMiss) {
@@ -386,12 +386,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 const processRow = typeof streamRow === 'function' && streamRow;
                 const rows = [];
                 let recordset = 1, resume, output;
-                const request = new db.Request(query, () => {
+                const request = new tedious.Request(query, () => {
                     if (error && this.handleFail(error, item, { errorQuery, commandType })) {
                         reject(error);
                     }
                     else {
-                        this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                        this.add(item, 4);
                         if (output) {
                             output.__recordset__ = 0;
                             output.__returnvalue__ = true;
@@ -405,9 +405,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     if (isOutputParameters(params)) {
                         ({ input: params, output: paramsOutput } = params);
                     }
-                    convertParameters.call(request, db.TYPES, params, false);
+                    convertParameters.call(request, tedious.TYPES, params, false);
                     if (paramsOutput) {
-                        convertParameters.call(request, db.TYPES, paramsOutput, true);
+                        convertParameters.call(request, tedious.TYPES, paramsOutput, true);
                     }
                 }
                 request

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mssql",
-  "version": "0.3.1",
+  "version": "0.3.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,9 +21,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "tedious": "^16.2.0",
+    "@e-mc/db": "^0.6.2",
+    "@e-mc/types": "^0.6.2",
+    "tedious": "^16.7.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> {