Merge pull request #3134 from ackerdev/mssql-connection-regression-patch

Fix regression in MSSQL ConnectionManager

lib/dialects/mssql/connection-manager.js

@@ -28,16 +28,17 @@ ConnectionManager.prototype.connect = function(config) {
       server: config.host,
       /* domain: 'DOMAIN' */
       options: {
+        port: config.port,
         database: config.database,
       }
     };
 
+    if (config.dialectOptions) {
       // only set port if no instance name was provided
-    if(!config.dialectOptions.instanceName){
-      connectionConfig.options.port = config.port;
+      if (config.dialectOptions.instanceName) {
+        delete connectionConfig.options.port;
       }
 
-    if (config.dialectOptions) {
       Object.keys(config.dialectOptions).forEach(function(key) {
         connectionConfig.options[key] = config.dialectOptions[key];
       });