Merge pull request #1343 from janmeier/bulkCreateLength

Handle models with a column named length in bulkcreate - Closes #1338

lib/dialects/mysql/query-generator.js

@@ -182,7 +182,7 @@ module.exports = (function() {
         , allAttributes = []
         , allAttributes = []
 
 
       Utils._.forEach(attrValueHashes, function(attrValueHash, i) {
       Utils._.forEach(attrValueHashes, function(attrValueHash, i) {
-        Utils._.forEach(attrValueHash, function(value, key, hash) {
+        Utils._.forOwn(attrValueHash, function(value, key, hash) {
           if (allAttributes.indexOf(key) === -1) allAttributes.push(key)
           if (allAttributes.indexOf(key) === -1) allAttributes.push(key)
         })
         })
       })
       })

lib/dialects/postgres/query-generator.js

@@ -274,7 +274,7 @@ module.exports = (function() {
         , allAttributes = []
         , allAttributes = []
 
 
       Utils._.forEach(attrValueHashes, function(attrValueHash, i) {
       Utils._.forEach(attrValueHashes, function(attrValueHash, i) {
-        Utils._.forEach(attrValueHash, function(value, key, hash) {
+        Utils._.forOwn(attrValueHash, function(value, key, hash) {
           if (allAttributes.indexOf(key) === -1) allAttributes.push(key)
           if (allAttributes.indexOf(key) === -1) allAttributes.push(key)
 
 
           if (tables[tableName] && tables[tableName][key]) {
           if (tables[tableName] && tables[tableName][key]) {

lib/dialects/sqlite/query-generator.js

@@ -178,7 +178,7 @@ module.exports = (function() {
         , allAttributes = []
         , allAttributes = []
 
 
       Utils._.forEach(attrValueHashes, function(attrValueHash, i) {
       Utils._.forEach(attrValueHashes, function(attrValueHash, i) {
-        Utils._.forEach(attrValueHash, function(value, key, hash) {
+        Utils._.forOwn(attrValueHash, function(value, key, hash) {
           if (allAttributes.indexOf(key) === -1) allAttributes.push(key)
           if (allAttributes.indexOf(key) === -1) allAttributes.push(key)
         })
         })
       })
       })

test/dao-factory/create.test.js

@@ -911,6 +911,18 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it('properly handles a model with a length column', function (done) {
+      var UserWithLength = this.sequelize.define('UserWithLength', {
+        length: Sequelize.INTEGER
+      })
+
+      UserWithLength.sync({force:true}).success(function() {
+        UserWithLength.bulkCreate([{ length: 42}, {length: 11}]).success(function () {
+          done()
+        })
+      })
+    })
+
     it('stores the current date in createdAt', function(done) {
     it('stores the current date in createdAt', function(done) {
       var self = this
       var self = this
         , data = [{ username: 'Peter'},
         , data = [{ username: 'Peter'},