tests for enums

lib/dialects/postgres/query-generator.js

@@ -36,8 +36,13 @@ function pgEscape(val) {
   return "'"+val+"'";
   return "'"+val+"'";
 }
 }
 
 
+function pgEscapeAndQuote(val) {
+  return addQuotes(removeQuotes(pgEscape(val), "'"))
+}
+
 function pgEnum(tableName, attr, dataType) {
 function pgEnum(tableName, attr, dataType) {
-  return "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
+  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
+  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
 }
 }
 
 
 function padInt(i) {
 function padInt(i) {
@@ -70,7 +75,7 @@ function pgDataTypeMapping(tableName, attr, dataType) {
   }
   }
 
 
   if (dataType.match(/^ENUM\(/)) {
   if (dataType.match(/^ENUM\(/)) {
-    dataType = dataType.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attr))
+    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
   }
   }
 
 
   return dataType
   return dataType
@@ -95,7 +100,7 @@ module.exports = (function() {
         attrStr.push(addQuotes(attr) + " " + dataType)
         attrStr.push(addQuotes(attr) + " " + dataType)
 
 
         if (attributes[attr].match(/^ENUM\(/)) {
         if (attributes[attr].match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attr, attributes[attr])) + query;
+          query = pgEnum(tableName, attr, attributes[attr]) + query;
         }
         }
       }
       }
 
 

spec/dao-factory.spec.js

@@ -795,8 +795,6 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         }.bind(this)) //- sequelize.sync
         }.bind(this)) //- sequelize.sync
       })
       })
     })
     })
-
-
   }) //- describe: find
   }) //- describe: find
 
 
   describe('findAll', function findAll() {
   describe('findAll', function findAll() {

spec/sequelize.spec.js

@@ -114,4 +114,32 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
       }.bind(this))
       }.bind(this))
     })
     })
   })
   })
+
+  describe('define', function() {
+    describe('enum', function() {
+      before(function(done) {
+        this.Review = this.sequelize.define('review', {
+          status: { type: Helpers.Sequelize.ENUM, values: ['scheduled', 'active', 'finished']}
+        })
+
+        this.Review.sync({ force: true }).success(done)
+      })
+
+      it('correctly stores values', function(done) {
+        this.Review.create({ status: 'active' }).success(function(review) {
+          expect(review.status).toEqual('active')
+          done()
+        })
+      })
+
+      it('correctly loads values', function(done) {
+        this.Review.create({ status: 'active' }).success(function() {
+          this.Review.findAll().success(function(reviews) {
+            expect(reviews[0].status).toEqual('active')
+            done()
+          })
+        }.bind(this))
+      })
+    })
+  })
 })
 })