Merge pull request #4623 from PenguinOfThunder/add-domain-support

Added support for passing domain option to tedious.

lib/dialects/mssql/connection-manager.js

@@ -27,7 +27,6 @@ ConnectionManager.prototype.connect = function(config) {
       userName: config.username,
       userName: config.username,
       password: config.password,
       password: config.password,
       server: config.host,
       server: config.host,
-      /* domain: 'DOMAIN' */
       options: {
       options: {
         port: config.port,
         port: config.port,
         database: config.database
         database: config.database
@@ -40,6 +39,12 @@ ConnectionManager.prototype.connect = function(config) {
         delete connectionConfig.options.port;
         delete connectionConfig.options.port;
       }
       }
 
 
+      // The 'tedious' driver needs domain property to be in the main Connection config object
+      if(config.dialectOptions.domain) {
+        connectionConfig.domain = config.dialectOptions.domain;
+        delete config.dialectOptions.domain;
+      }
+
       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];
       });
       });