不要怂,就是干,撸起袖子干!

Commit 7d7fac97 by Nick Acker

Fix regression in MSSQL ConnectionManager

1 parent 009f4dab
Showing with 6 additions and 5 deletions
...@@ -28,16 +28,17 @@ ConnectionManager.prototype.connect = function(config) { ...@@ -28,16 +28,17 @@ ConnectionManager.prototype.connect = function(config) {
server: config.host, server: config.host,
/* domain: 'DOMAIN' */ /* domain: 'DOMAIN' */
options: { options: {
port: config.port,
database: config.database, database: config.database,
} }
}; };
// only set port if no instance name was provided
if(!config.dialectOptions.instanceName){
connectionConfig.options.port = config.port;
}
if (config.dialectOptions) { if (config.dialectOptions) {
// only set port if no instance name was provided
if (config.dialectOptions.instanceName) {
delete connectionConfig.options.port;
}
Object.keys(config.dialectOptions).forEach(function(key) { Object.keys(config.dialectOptions).forEach(function(key) {
connectionConfig.options[key] = config.dialectOptions[key]; connectionConfig.options[key] = config.dialectOptions[key];
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!