Sequelize.ENUM can now take values as arguments or as a single array argument

lib/data-types.js

@@ -254,10 +254,11 @@ module.exports = {
   get ENUM() {
   get ENUM() {
     var result = function() {
     var result = function() {
       return {
       return {
-        type:   'ENUM',
+        type: 'ENUM',
         values: Array.prototype.slice.call(arguments).reduce(function(result, element) {
         values: Array.prototype.slice.call(arguments).reduce(function(result, element) {
           return result.concat(Array.isArray(element) ? element : [ element ])
           return result.concat(Array.isArray(element) ? element : [ element ])
-        }, [])
+        }, []),
+        toString: result.toString
       }
       }
     }
     }
 
 

lib/dialects/mysql/query-generator.js

@@ -292,6 +292,12 @@ module.exports = (function() {
         if (Utils.isHash(dataType)) {
         if (Utils.isHash(dataType)) {
           var template
           var template
 
 
+          // We have special cases where the type is an object containing
+          // the values (e.g. Sequelize.ENUM(value, value2) returns an object
+          // instead of a function)
+          // Copy these values to the dataType
+          dataType.values = dataType.type.values || dataType.values;
+
           if (dataType.type.toString() === DataTypes.ENUM.toString()) {
           if (dataType.type.toString() === DataTypes.ENUM.toString()) {
             if (Array.isArray(dataType.values) && (dataType.values.length > 0)) {
             if (Array.isArray(dataType.values) && (dataType.values.length > 0)) {
               template = "ENUM(" + Utils._.map(dataType.values, function(value) {
               template = "ENUM(" + Utils._.map(dataType.values, function(value) {

test/dao-factory/create.test.js

@@ -651,6 +651,34 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         })
         })
       })
       })
 
 
+      it('allows values passed as parameters to Sequelize.ENUM', function(done) {
+        var Enum = this.sequelize.define('Enum', {
+          state: {
+            type: Sequelize.ENUM('happy', 'sad')
+          }
+        })
+
+        Enum.sync({ force: true }).success(function() {
+          Enum.create({ state: 'happy' }).success(function(_item) {
+            done()
+          });
+        });
+      })
+
+      it('allows values passed as an array to Sequelize.ENUM', function(done) {
+        var Enum = this.sequelize.define('Enum', {
+          state: {
+            type: Sequelize.ENUM(['happy', 'sad'])
+          }
+        })
+
+        Enum.sync({ force: true }).success(function() {
+          Enum.create({ state: 'happy' }).success(function(_item) {
+            done()
+          });
+        });
+      })
+
       describe('can safely sync multiple times', function(done) {
       describe('can safely sync multiple times', function(done) {
         it('through the factory', function(done) {
         it('through the factory', function(done) {
           var Enum = this.sequelize.define('Enum', {
           var Enum = this.sequelize.define('Enum', {