Merge pull request #2512 from jeff-french/master

Fix for ENUM support in migration.addColumn with postgres dialect.

lib/dialects/postgres/query-generator.js

@@ -175,17 +175,16 @@ module.exports = (function() {
 
 
     addColumnQuery: function(table, key, dataType) {
     addColumnQuery: function(table, key, dataType) {
       var query = 'ALTER TABLE <%= table %> ADD COLUMN <%= attribute %>;'
       var query = 'ALTER TABLE <%= table %> ADD COLUMN <%= attribute %>;'
+        , dbDataType = this.attributeToSQL(dataType, {context: 'addColumn'})
         , attribute;
         , attribute;
 
 
-      if (dataType.toString() === DataTypes.ENUM.toString()) {
+      if ((dataType.type && dataType.type.toString() === DataTypes.ENUM.toString()) || dataType.toString() === DataTypes.ENUM.toString()) {
         query = this.pgEnum(table, key, dataType) + query;
         query = this.pgEnum(table, key, dataType) + query;
       }
       }
 
 
       attribute = Utils._.template('<%= key %> <%= definition %>')({
       attribute = Utils._.template('<%= key %> <%= definition %>')({
         key: this.quoteIdentifier(key),
         key: this.quoteIdentifier(key),
-        definition: this.attributeToSQL(dataType, {
-          context: 'addColumn'
-        })
+        definition: this.pgDataTypeMapping(table, key, dbDataType)
       });
       });
 
 
       return Utils._.template(query)({
       return Utils._.template(query)({

lib/dialects/sqlite/query-generator.js

@@ -155,8 +155,24 @@ module.exports = (function() {
       return query;
       return query;
     },
     },
 
 
-    addColumnQuery: function() {
-      var sql = MySqlQueryGenerator.addColumnQuery.apply(this, arguments);
+    addColumnQuery: function(table, key, dataType) {
+      var query = 'ALTER TABLE <%= table %> ADD <%= attribute %>;'
+        , attributes = {};
+
+      attributes[key] = dataType;
+      var fields = this.attributesToSQL(attributes, {
+        context: 'addColumn'
+      });
+      var attribute = Utils._.template('<%= key %> <%= definition %>')({
+          key: this.quoteIdentifier(key),
+          definition: fields[key]
+        });
+
+      var sql =  Utils._.template(query)({
+        table: this.quoteTable(table),
+        attribute: attribute
+      });
+
       return this.replaceBooleanDefaults(sql);
       return this.replaceBooleanDefaults(sql);
     },
     },
 
 

test/query-interface.test.js

@@ -248,6 +248,17 @@ describe(Support.getTestDialectTeaser("QueryInterface"), function () {
         });
         });
       });
       });
     });
     });
+
+    it('should work with enums (1)', function () {
+      return this.queryInterface.addColumn('users', 'someEnum', DataTypes.ENUM('value1', 'value2', 'value3'));
+    });
+
+    it('should work with enums (2)', function () {
+      return this.queryInterface.addColumn('users', 'someOtherEnum', {
+        type: DataTypes.ENUM,
+        values: ['value1', 'value2', 'value3']
+      });
+    });
   });
   });
 
 
   describe('describeForeignKeys', function() {
   describe('describeForeignKeys', function() {