Skip to content
This repository has been archived by the owner on Feb 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #3 from peoplewareDo/master
Browse files Browse the repository at this point in the history
update mssql v4.0.1 dependency
  • Loading branch information
davepreston authored Dec 4, 2018
2 parents c2a8582 + f693b74 commit a94851c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ module.exports = (function () {
var isPersistent = connections[connection].config.persistent;

if (isPersistent && (!connections[connection].mssqlConnection || !connections[connection].mssqlConnection.connected)) {
connections[connection].mssqlConnection = new mssql.Connection(marshalConfig(connections[connection].config));
connections[connection].mssqlConnection = new mssql.ConnectionPool(marshalConfig(connections[connection].config));
connections[connection].mssqlConnection.connect()
.then(cb);
}
Expand All @@ -127,7 +127,7 @@ module.exports = (function () {
connections[connection].mssqlConnection = [];
}

connections[connection].mssqlConnection[uniqId] = new mssql.Connection(marshalConfig(connections[connection].config));
connections[connection].mssqlConnection[uniqId] = new mssql.ConnectionPool(marshalConfig(connections[connection].config));
connections[connection].mssqlConnection[uniqId].connect()
.then(function(err) {
cb(err, uniqId);
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sails-sqlserver",
"version": "0.10.9",
"version": "0.10.10",
"description": "Official SQL Server Adapter for Sails / Waterline",
"main": "lib/adapter.js",
"scripts": {
Expand Down Expand Up @@ -36,11 +36,11 @@
],
"license": "MIT",
"dependencies": {
"captains-log": "^0.11.11",
"lodash": "^3.8.0",
"mssql": "^2.1.3",
"captains-log": "^1.0.2",
"lodash": "^4.17.4",
"mssql": "^4.0.1",
"underscore.string": "^3.0.0",
"waterline-cursor": "0.0.5"
"waterline-cursor": "0.0.7"
},
"bundledDependencies": [
"lodash",
Expand Down

0 comments on commit a94851c

Please sign in to comment.