Merge pull request #553 from crossman/master

Better error message for bad data types in define

lib/dao-factory.js

@@ -56,11 +56,6 @@ module.exports = (function() {
 
 
     this.primaryKeys = {};
     this.primaryKeys = {};
     Utils._.each(this.attributes, function(dataTypeString, attributeName) {
     Utils._.each(this.attributes, function(dataTypeString, attributeName) {
-      // If you don't specify a valid data type lets help you debug it
-      if (dataTypeString === undefined) {
-        throw new Error("Unrecognized data type for field " + attributeName );
-      }
-
       if ((attributeName !== 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) {
       if ((attributeName !== 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) {
         self.primaryKeys[attributeName] = dataTypeString
         self.primaryKeys[attributeName] = dataTypeString
       }
       }

lib/sequelize.js

@@ -151,6 +151,16 @@ module.exports = (function() {
     options = options || {}
     options = options || {}
     var globalOptions = this.options
     var globalOptions = this.options
 
 
+    // If you don't specify a valid data type lets help you debug it
+    Utils._.each(attributes, function(dataType, name){
+      if (Utils.isHash(dataType)) {
+        dataType = dataType.type
+      }
+      if (dataType === undefined) {
+        throw new Error('Unrecognized data type for field '+ name)
+      }
+    })
+
     if (globalOptions.define) {
     if (globalOptions.define) {
       options = Utils._.extend({}, globalOptions.define, options)
       options = Utils._.extend({}, globalOptions.define, options)
       Utils._(['classMethods', 'instanceMethods']).each(function(key) {
       Utils._(['classMethods', 'instanceMethods']).each(function(key) {

spec/dao-factory.spec.js

@@ -216,6 +216,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
           activity_date: Sequelize.DATe
           activity_date: Sequelize.DATe
         })
         })
       }.bind(this), 'Unrecognized data type for field activity_date')
       }.bind(this), 'Unrecognized data type for field activity_date')
+
+      Helpers.assertException(function() {
+        this.sequelize.define('UserBadDataType', {
+          activity_date: {type: Sequelize.DATe}
+        })
+      }.bind(this), 'Unrecognized data type for field activity_date')
     })
     })
 
 
     it('sets a 64 bit int in bigint', function(done) {
     it('sets a 64 bit int in bigint', function(done) {