Merge branch 'trezm-fixing_remove_column'

lib/dialects/mysql/query-generator.js

@@ -115,8 +115,11 @@ module.exports = (function() {
     },
 
     removeColumnQuery: function(tableName, attributeName) {
-      var query = 'ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;';
-      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName });
+      var query = 'ALTER TABLE <%= tableName %> DROP <%= attributeName %>;';
+      return Utils._.template(query)({
+        tableName: this.quoteTable(tableName),
+        attributeName: this.quoteIdentifier(attributeName)
+      });
     },
 
     changeColumnQuery: function(tableName, attributes) {

lib/dialects/postgres/query-generator.js

@@ -222,7 +222,7 @@ module.exports = (function() {
     removeColumnQuery: function(tableName, attributeName) {
       var query = 'ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;';
       return Utils._.template(query)({
-        tableName: this.quoteIdentifiers(tableName),
+        tableName: this.quoteTable(tableName),
         attributeName: this.quoteIdentifier(attributeName)
       });
     },

test/unit/sql/remove-column.test.js

+'use strict';
+
+var Support   = require(__dirname + '/../support')
+  , expectsql = Support.expectsql
+  , current   = Support.sequelize
+  , sql       = current.dialect.QueryGenerator
+  , current = Support.sequelize;
+
+// Notice: [] will be replaced by dialect specific tick/quote character when there is not dialect specific expectation but only a default expectation
+
+suite(Support.getTestDialectTeaser('SQL'), function() {
+  suite('removeColumn', function () {
+    test('schema', function () {
+      expectsql(sql.removeColumnQuery({
+        schema: 'archive',
+        tableName: 'user'
+      }, 'email'), {
+        default: "ALTER TABLE [archive].[user] DROP COLUMN [email];",
+        mysql: "ALTER TABLE `archive.user` DROP `email`;"
+      });
+    });
+  });
+});
\ No newline at end of file