Merge pull request #2333 from sequelize/fix2225

Fix #2225

lib/dao.js

@@ -647,12 +647,15 @@ module.exports = (function() {
   // private
   // private
   var initValues = function(values, options) {
   var initValues = function(values, options) {
     // set id to null if not passed as value, a newly created dao has no id
     // set id to null if not passed as value, a newly created dao has no id
-    var defaults = this.hasPrimaryKeys ? {} : { id: null },
-        key;
+    var defaults,
+        key,
+        primaryKeyAttribute;
 
 
     values = values && _.clone(values) || {}
     values = values && _.clone(values) || {}
 
 
     if (options.isNewRecord) {
     if (options.isNewRecord) {
+      defaults = {};
+
       if (this.hasDefaultValues) {
       if (this.hasDefaultValues) {
         Utils._.each(this.defaultValues, function(valueFn, key) {
         Utils._.each(this.defaultValues, function(valueFn, key) {
           if (!defaults.hasOwnProperty(key)) {
           if (!defaults.hasOwnProperty(key)) {
@@ -661,6 +664,19 @@ module.exports = (function() {
         })
         })
       }
       }
 
 
+      // set pk to null if not passed as value, a newly created dao has no id
+      // removing this breaks bulkCreate
+      // do after default values since it might have UUID as a default value
+      if (this.Model._hasPrimaryKeys) {
+        primaryKeyAttribute = this.model.primaryKeyAttributes[0];
+      } else {
+        primaryKeyAttribute = 'id';
+      }
+
+      if (!defaults.hasOwnProperty(primaryKeyAttribute)) {
+        defaults[primaryKeyAttribute] = null;
+      }
+
       if (this.Model._timestampAttributes.createdAt && defaults[this.Model._timestampAttributes.createdAt]) {
       if (this.Model._timestampAttributes.createdAt && defaults[this.Model._timestampAttributes.createdAt]) {
         this.dataValues[this.Model._timestampAttributes.createdAt] = Utils.toDefaultValue(defaults[this.Model._timestampAttributes.createdAt]);
         this.dataValues[this.Model._timestampAttributes.createdAt] = Utils.toDefaultValue(defaults[this.Model._timestampAttributes.createdAt]);
         delete defaults[this.Model._timestampAttributes.createdAt];
         delete defaults[this.Model._timestampAttributes.createdAt];
@@ -675,11 +691,12 @@ module.exports = (function() {
         this.dataValues[this.Model._timestampAttributes.deletedAt] = Utils.toDefaultValue(defaults[this.Model._timestampAttributes.deletedAt]);
         this.dataValues[this.Model._timestampAttributes.deletedAt] = Utils.toDefaultValue(defaults[this.Model._timestampAttributes.deletedAt]);
         delete defaults[this.Model._timestampAttributes.deletedAt];
         delete defaults[this.Model._timestampAttributes.deletedAt];
       }
       }
-    }
-    if (Object.keys(defaults).length) {
-      for (key in defaults) {
-        if (!values.hasOwnProperty(key)) {
-          values[key] = Utils.toDefaultValue(defaults[key])
+
+      if (Object.keys(defaults).length) {
+        for (key in defaults) {
+          if (!values.hasOwnProperty(key)) {
+            values[key] = Utils.toDefaultValue(defaults[key])
+          }
         }
         }
       }
       }
     }
     }