Merge master

lib/query-interface.js

@@ -216,7 +216,7 @@ module.exports = (function() {
             , i = 0
 
           for (i = 0; i < keyLen; i++) {
-            if (daoTable.rawAttributes[keys[i]].type && daoTable.rawAttributes[keys[i]].type === "ENUM") {
+            if (daoTable.rawAttributes[keys[i]].type && daoTable.rawAttributes[keys[i]].type.toString() === "ENUM") {
               chainer.add(self.sequelize, 'query', [self.QueryGenerator.pgEnumDrop(getTableName, keys[i]), null, {logging: options.logging, raw: true}])
             }
           }

test/postgres/dao.test.js

@@ -80,6 +80,37 @@ if (dialect.match(/^postgres/)) {
         })
       })
 
+      it("should be able to create/drop multiple enums multiple times", function(done) {
+        var DummyModel = this.sequelize.define('Dummy-pg', {
+          username: DataTypes.STRING,
+          theEnumOne: {
+            type: DataTypes.ENUM,
+            values:[
+              'one',
+              'two',
+              'three',
+            ]
+          },
+          theEnumTwo: {
+            type: DataTypes.ENUM,
+            values:[
+              'four',
+              'five',
+              'six',
+            ],
+          }
+        })
+
+        DummyModel.sync({ force: true }).done(function(err) {
+          expect(err).not.to.be.ok
+          // now sync one more time:
+          DummyModel.sync({force: true}).done(function(err) {
+            expect(err).not.to.be.ok
+            done();
+          })
+        })
+      })
+
       it('should be able to add enum types', function(done) {
         var self = this
           , User = this.sequelize.define('UserEnums', {