mssql-cr-layer 2.0.8 → 2.0.12

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Andre Gloria <andredagloria@gmail.com> (andrglo.com)
+Copyright (c) 2021 Andre Gloria <andredagloria@gmail.com> (andrglo.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mssql-cr-layer",
-  "version": "2.0.8",
+  "version": "2.0.12",
   "description": "A MS SQL Server interface layer for common requests",
   "repository": "andrglo/mssql-cr-layer",
   "author": {
@@ -20,11 +20,11 @@
     "interface"
   ],
   "devDependencies": {
-    "chai": "^4.2.0",
-    "coveralls": "^3.1.0",
-    "eslint": "^7.8.1",
+    "chai": "^4.3.4",
+    "coveralls": "^3.1.1",
+    "eslint": "^8.1.0",
     "eslint-config-google": "^0.14.0",
-    "mocha": "^8.1.3",
+    "mocha": "^8.4.0",
     "nyc": "^15.1.0"
   },
   "scripts": {
@@ -35,6 +35,6 @@
   "license": "MIT",
   "dependencies": {
     "lodash.every": "^4.6.0",
-    "mssql": "^6.2.1"
+    "mssql": "^7.2.1"
   }
 }

package/src/index.js

@@ -343,14 +343,13 @@ function decimalPlaces(num) {
 }
 
 function toMssqlConfig(config) {
-  return {
+  const mssqlConfig = {
     port: 1433,
     server: config.host || 'localhost',
     requestTimeout: 6000,
     ...config || {},
     pool: {
-      min: 0,
-      ...config.pool || {}
+      min: 0
     },
     options: {
       encrypt: false,
@@ -358,4 +357,12 @@ function toMssqlConfig(config) {
       ...config.options || {},
     }
   }
+  if (config.pool) {
+    mssqlConfig.pool = {...mssqlConfig.pool, ...config.pool}
+    if (mssqlConfig.pool.idleTimeout) {
+      mssqlConfig.pool.idleTimeoutMillis = mssqlConfig.pool.idleTimeout
+      delete mssqlConfig.pool.idleTimeout
+    }
+  }
+  return mssqlConfig
 }