Code style changes requested by @mickhansen in the pull request (https://github.…

…com/sequelize/sequelize/pull/2697)

lib/dialects/mssql/connection-manager.js

@@ -43,45 +43,45 @@ ConnectionManager.prototype.connect = function(config) {
     connection.lib = self.lib;
     connection.lib = self.lib;
 
 
     connection.on('connect', function(err) {
     connection.on('connect', function(err) {
-      if (err) {
-        if (err.code) {
-          switch (err.code) {
-          case 'ESOCKET':
-            if (Utils._.contains(err.message, 'connect EHOSTUNREACH')) {
-              reject(new sequelizeErrors.HostNotReachableError(err));
-            } else if (Utils._.contains(err.message, 'connect ECONNREFUSED')) {
-              reject(new sequelizeErrors.ConnectionRefusedError(err));
-            } else {
-              reject(new sequelizeErrors.ConnectionError(err));
-            }
-            break;
-          case 'ECONNREFUSED':
-            reject(new sequelizeErrors.ConnectionRefusedError(err));
-            break;
-          case 'ER_ACCESS_DENIED_ERROR':
-            reject(new sequelizeErrors.AccessDeniedError(err));
-            break;
-          case 'ENOTFOUND':
-            reject(new sequelizeErrors.HostNotFoundError(err));
-            break;
-          case 'EHOSTUNREACH':
-            reject(new sequelizeErrors.HostNotReachableError(err));
-            break;
-          case 'EINVAL':
-            reject(new sequelizeErrors.InvalidConnectionError(err));
-            break;
-          default:
-            reject(new sequelizeErrors.ConnectionError(err));
-            break;
-          }
-        } else {
-          reject(new sequelizeErrors.ConnectionError(err));
-        }
+      if (!err) {
+        resolve(connection);
+        return;
+      }
 
 
+      if (!err.code) {
+        reject(new sequelizeErrors.ConnectionError(err));
         return;
         return;
       }
       }
 
 
-      resolve(connection);
+      switch (err.code) {
+      case 'ESOCKET':
+        if (Utils._.contains(err.message, 'connect EHOSTUNREACH')) {
+          reject(new sequelizeErrors.HostNotReachableError(err));
+        } else if (Utils._.contains(err.message, 'connect ECONNREFUSED')) {
+          reject(new sequelizeErrors.ConnectionRefusedError(err));
+        } else {
+          reject(new sequelizeErrors.ConnectionError(err));
+        }
+        break;
+      case 'ECONNREFUSED':
+        reject(new sequelizeErrors.ConnectionRefusedError(err));
+        break;
+      case 'ER_ACCESS_DENIED_ERROR':
+        reject(new sequelizeErrors.AccessDeniedError(err));
+        break;
+      case 'ENOTFOUND':
+        reject(new sequelizeErrors.HostNotFoundError(err));
+        break;
+      case 'EHOSTUNREACH':
+        reject(new sequelizeErrors.HostNotReachableError(err));
+        break;
+      case 'EINVAL':
+        reject(new sequelizeErrors.InvalidConnectionError(err));
+        break;
+      default:
+        reject(new sequelizeErrors.ConnectionError(err));
+        break;
+      }
     });
     });
   });
   });
 };
 };

lib/dialects/mssql/query-generator.js

@@ -19,7 +19,8 @@ module.exports = (function() {
         'WHERE schema_name =', wrapSingleQuote(schema), ')',
         'WHERE schema_name =', wrapSingleQuote(schema), ')',
         'BEGIN',
         'BEGIN',
           'EXEC sp_executesql N\'CREATE SCHEMA', this.quoteIdentifier(schema),';\'',
           'EXEC sp_executesql N\'CREATE SCHEMA', this.quoteIdentifier(schema),';\'',
-        "END;"].join(' ');
+        "END;"
+      ].join(' ');
     },
     },
 
 
     showSchemasQuery: function() {
     showSchemasQuery: function() {
@@ -27,7 +28,8 @@ module.exports = (function() {
         'SELECT "name" as "schema_name" FROM sys.schemas as s',
         'SELECT "name" as "schema_name" FROM sys.schemas as s',
         'WHERE "s"."name" NOT IN (',
         'WHERE "s"."name" NOT IN (',
           "'INFORMATION_SCHEMA', 'dbo', 'guest', 'sys', 'archive'",
           "'INFORMATION_SCHEMA', 'dbo', 'guest', 'sys', 'archive'",
-        ")", "AND", '"s"."name" NOT LIKE', "'db_%'"].join(' ');
+        ")", "AND", '"s"."name" NOT LIKE', "'db_%'"
+      ].join(' ');
     },
     },
 
 
     versionQuery: function() {
     versionQuery: function() {
@@ -178,7 +180,8 @@ module.exports = (function() {
 
 
       return Utils._.template(query)({
       return Utils._.template(query)({
         tableName: this.quoteTable(tableName),
         tableName: this.quoteTable(tableName),
-        attributes: attrString.join(', ') });
+        attributes: attrString.join(', ')
+      });
     },
     },
 
 
     renameColumnQuery: function(tableName, attrBefore, attributes) {
     renameColumnQuery: function(tableName, attrBefore, attributes) {

test/model.test.js

@@ -2091,8 +2091,6 @@ describe(Support.getTestDialectTeaser("Model"), function () {
           expect(sql).to.match(/FOREIGN KEY \("authorId"\) REFERENCES "authors" \("id"\)/)
           expect(sql).to.match(/FOREIGN KEY \("authorId"\) REFERENCES "authors" \("id"\)/)
         } else if (dialect === 'sqlite') {
         } else if (dialect === 'sqlite') {
           expect(sql).to.match(/`authorId` INTEGER REFERENCES `authors` \(`id`\)/)
           expect(sql).to.match(/`authorId` INTEGER REFERENCES `authors` \(`id`\)/)
-        } else if (dialect === 'mssql') {
-          expect(sql).to.match(/`authorId` INTEGER REFERENCES `authors` \(`id`\)/)
         } else {
         } else {
           throw new Error('Undefined dialect!')
           throw new Error('Undefined dialect!')
         }
         }