remove as much code from SqlGenerator as possible

lib/dialects/mssql/query-generator.js

@@ -91,35 +91,49 @@ module.exports = (function() {
       return Utils._.template(query)(values).trim() + ";";
       return Utils._.template(query)(values).trim() + ";";
     },
     },
 
 
-    addColumnQuery: function(tableName, key, dataType) {
-      // FIXME: attributeToSQL SHOULD be using attributes in addColumnSql
+    addColumnQuery: function(table, key, dataType) {
+      // FIXME: attributeToSQL SHOULD be using attributes in addColumnQuery
       //        but instead we need to pass the key along as the field here
       //        but instead we need to pass the key along as the field here
       dataType.field = key;
       dataType.field = key;
 
 
-      var query = [
-        SqlGenerator.alterTableSql(tableName),
-        SqlGenerator.addColumnSql(key, dataType)
-      ].join(' ') + ';';
+      var query = 'ALTER TABLE <%= table %> ADD <%= attribute %>;'
+        , attribute = Utils._.template('<%= key %> <%= definition %>')({
+          key: this.quoteIdentifier(key),
+          definition: this.attributeToSQL(dataType, {
+            context: 'addColumn'
+          })
+        });
 
 
-      return query;
+      return Utils._.template(query)({
+        table: this.quoteTable(table),
+        attribute: attribute
+      });
     },
     },
 
 
     removeColumnQuery: function(tableName, attributeName) {
     removeColumnQuery: function(tableName, attributeName) {
-      var query = [
-        SqlGenerator.alterTableSql(tableName),
-        SqlGenerator.dropSql(attributeName)
-      ].join(' ') + ';';
-      return query;
+      var query = 'ALTER TABLE <%= tableName %> DROP <%= attributeName %>;';
+      return Utils._.template(query)({
+        tableName: this.quoteTable(tableName),
+        attributeName: this.quoteIdentifier(attributeName)
+      });
     },
     },
 
 
     changeColumnQuery: function(tableName, attributes) {
     changeColumnQuery: function(tableName, attributes) {
-      var query = [
-        SqlGenerator.alterTableSql(tableName),
-        SqlGenerator.alterColumnSql(),
-        SqlGenerator.alterAttributesSql(attributes)
-      ].join(' ') + ';';
+      var query = 'ALTER TABLE <%= tableName %> ALTER COLUMN <%= attributes %>;';
+      var attrString = [];
 
 
-      return query;
+      for (var attrName in attributes) {
+        var definition = attributes[attrName];
+
+        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
+          attrName: this.quoteIdentifier(attrName),
+          definition: definition
+        }));
+      }
+
+      return Utils._.template(query)({
+        tableName: this.quoteTable(tableName),
+        attributes: attrString.join(', ') });
     },
     },
 
 
     renameColumnQuery: function(tableName, attrBefore, attributes) {
     renameColumnQuery: function(tableName, attrBefore, attributes) {
@@ -188,19 +202,44 @@ module.exports = (function() {
       };
       };
 
 
       var generatedQuery = Utils._.template(allQueries.join(';'))(replacements);
       var generatedQuery = Utils._.template(allQueries.join(';'))(replacements);
-      if (needIdentityInsertWrapper)
-        return SqlGenerator.identityInsertWrapper(generatedQuery, tableName);
+      if (needIdentityInsertWrapper) {
+        generatedQuery = [
+          'SET IDENTITY_INSERT', this.quoteTable(tableName), 'ON;',
+          generatedQuery,
+          'SET IDENTITY_INSERT', this.quoteTable(tableName), 'OFF;',
+        ].join(' ');
+      }
+
       return generatedQuery;
       return generatedQuery;
     },
     },
 
 
     deleteQuery: function(tableName, where, options) {
     deleteQuery: function(tableName, where, options) {
-      var query = [
-        SqlGenerator.deleteSql(tableName),
-        "WHERE",
-        this.getWhereConditions(where),
-        ";SELECT @@ROWCOUNT AS AFFECTEDROWS;"].join(' ');
+      options = options || {};
 
 
-      return query;
+      var table = this.quoteTable(tableName);
+      if (options.truncate === true) {
+        // Truncate does not allow LIMIT and WHERE
+        return 'TRUNCATE ' + table;
+      }
+
+      where = this.getWhereConditions(where);
+      var limit = ''
+        , query = 'DELETE<%= limit %> FROM <%= table %> WHERE <%= where %>; ' +
+                  'SELECT @@ROWCOUNT AS AFFECTEDROWS;';
+
+      if (Utils._.isUndefined(options.limit)) {
+        options.limit = 1;
+      }
+
+      if (!!options.limit) {
+        limit = ' TOP(' + this.escape(options.limit) + ')';
+      }
+
+      return Utils._.template(query)({
+        limit: limit,
+        table: table,
+        where: where,
+      });
     },
     },
 
 
     showIndexQuery: function(tableName, options) {
     showIndexQuery: function(tableName, options) {
@@ -228,6 +267,10 @@ module.exports = (function() {
       return Utils._.template(sql)(values);
       return Utils._.template(sql)(values);
     },
     },
 
 
+    attributeToSQL: function(attribute, options) {
+      return SqlGenerator.attributeToSQL(attribute, options);
+    },
+
     attributesToSQL: function(attributes, options) {
     attributesToSQL: function(attributes, options) {
       var result = {}
       var result = {}
         , key
         , key
@@ -331,10 +374,10 @@ module.exports = (function() {
     },
     },
 
 
     dropForeignKeyQuery: function(tableName, foreignKey) {
     dropForeignKeyQuery: function(tableName, foreignKey) {
-      return [
-        SqlGenerator.alterTableSql(tableName),
-        SqlGenerator.dropSql(foreignKey)
-      ].join(' ') + ';';
+      return Utils._.template('ALTER TABLE <%= table %> DROP <%= key %>')({
+        table: this.quoteTable(tableName),
+        key: this.quoteIdentifier(foreignKey)
+      });
     },
     },
 
 
     setAutocommitQuery: function(value) {
     setAutocommitQuery: function(value) {

lib/dialects/mssql/sql-generator.js

@@ -116,45 +116,6 @@ module.exports = {
     return table;
     return table;
   },
   },
 
 
-  identityInsertWrapper: function(query, table){
-    return[
-      'SET IDENTITY_INSERT', quoteIdentifier(table), 'ON;',
-      query,
-      'SET IDENTITY_INSERT', quoteIdentifier(table), 'OFF;',
-    ].join(' ');
-  },
-
-  alterTableSql: function(tableName){
-    var query = 'ALTER TABLE <%= tableName %>';
-    var value = {
-      tableName : quoteIdentifier(tableName)
-    };
-    return Utils._.template(query)(value);
-  },
-
-  deleteSql: function(tableName) {
-    var query = "DELETE FROM <%= table %>";
-    var replacements = {
-      table: quoteIdentifier(tableName.toString())
-    };
-
-    return Utils._.template(query)(replacements);
-  },
-
-  addColumnSql: function(key, dataType){
-    var attribute = Utils._.template('<%= key %> <%= definition %>')({
-      key: quoteIdentifier(key),
-      definition: this.attributeToSQL(dataType, {
-        context: 'addColumn'
-      })
-    });
-    return 'ADD ' + attribute;
-  },
-
-  alterColumnSql: function(){
-    return 'ALTER COLUMN';
-  },
-
   renameColumnSql: function(tableName, attrBefore, newColumnName){
   renameColumnSql: function(tableName, attrBefore, newColumnName){
     var query = 'EXEC SP_RENAME \'<%= tableName %>.<%= before %>\', \'<%= after %>\';';
     var query = 'EXEC SP_RENAME \'<%= tableName %>.<%= before %>\', \'<%= after %>\';';
     var attrString = [];
     var attrString = [];
@@ -256,26 +217,6 @@ module.exports = {
     }
     }
 
 
     return template.join(' ');
     return template.join(' ');
-  },
-
-  dropSql: function(val){
-    return [
-      'DROP',
-      quoteIdentifier(val)
-    ].join(' ');
-  },
-
-  alterAttributesSql: function(attributes){
-    var attrString = [];
-    for (var attrName in attributes) {
-      var definition = attributes[attrName];
-
-      attrString.push(Utils._.template('"<%= attrName %>" <%= definition %>')({
-        attrName: attrName,
-        definition: definition
-      }));
-    }
-    return attrString.join(', ');
-  },
+  }
 
 
 };
 };

test/instance.test.js

@@ -1480,8 +1480,8 @@ describe(Support.getTestDialectTeaser("Instance"), function () {
               }
               }
               else if (Support.dialectIsMySQL()) {
               else if (Support.dialectIsMySQL()) {
                 expect(sql).to.equal("DELETE FROM `UserDestroys` WHERE `newId`='123ABC' LIMIT 1")
                 expect(sql).to.equal("DELETE FROM `UserDestroys` WHERE `newId`='123ABC' LIMIT 1")
-              } else if(dialect === 'mssql'){
-                expect(sql).to.equal('DELETE FROM "UserDestroys" WHERE "newId"=\'123ABC\' ;SELECT @@ROWCOUNT AS AFFECTEDROWS;')
+              } else if (dialect === 'mssql') {
+                expect(sql).to.equal('DELETE TOP(1) FROM "UserDestroys" WHERE "newId"=\'123ABC\'; SELECT @@ROWCOUNT AS AFFECTEDROWS;')
               }else {
               }else {
                 expect(sql).to.equal("DELETE FROM `UserDestroys` WHERE `newId`='123ABC'")
                 expect(sql).to.equal("DELETE FROM `UserDestroys` WHERE `newId`='123ABC'")
               }
               }