Refactor given understanding of how it's possible to return autogenerated ids; tests for bulkCreate

lib/dao-factory.js

@@ -410,13 +410,28 @@ module.exports = (function() {
     if (this.options.timestamps && this.options.paranoid) {
       var attr = this.options.underscored ? 'deleted_at' : 'deletedAt'
       var attrValueHash = {}
-      attrValueHash[attr] = new Date()
+      attrValueHash[attr] = Utils.now()
       return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
     } else {
       return this.QueryInterface.bulkDelete(this.tableName, options)
     }
   }
 
+  /**
+   * Update multiple instances
+   *
+   * @param  {Object} attrValueHash A hash of fields to change and their new values
+   * @param  {Object} options       Options to describe the scope of the search.
+   * @return {Object}               A promise which fires `success`, `error`, `complete` and `sql`.
+   */
+  DAOFactory.prototype.bulkUpdate = function(attrValueHash, options) {
+    if(this.options.timestamps) {
+      var attr = this.options.underscored ? 'updated_at' : 'updatedAt'
+      attrValueHash[attr] = Utils.now()
+    }
+    return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
+  }
+
   // private
 
   var query = function() {

lib/dialects/postgres/query-generator.js

@@ -332,6 +332,18 @@ module.exports = (function() {
         , tuples    = []
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
+
+        // don't insert serials (Postgres doesn't like it when they're NULL)
+        Utils._.forEach(attrValueHash, function(value, key, hash) {
+          if (tables[tableName] && tables[tableName][key]) {
+            switch (tables[tableName][key]) {
+              case 'serial':
+                delete hash[key]
+                break
+            }
+          }
+        });
+
         tuples.push("(" +
           Utils._.values(attrValueHash).map(function(value){
             return QueryGenerator.pgEscape(value)

spec/dao-factory.spec.js

@@ -389,96 +389,130 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
   describe('bulkCreate', function() {
 
-    it('inserts multiple values', function(done) {
+    it('inserts multiple values respecting the white list', function(done) {
       var self = this
         , data = [{ username: 'Peter', secretValue: '42' },
                   { username: 'Paul', secretValue: '23'}]
 
-      this.User.bulkCreate(data, ['username']).success(function(users) {
-        // self.User.find(user.id).success(function(_user) {
-        //   expect(_user.username).toEqual(data.username)
-        //   expect(_user.secretValue).not.toEqual(data.secretValue)
-        //   expect(_user.secretValue).toEqual(null)
+      this.User.bulkCreate(data, ['username']).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].secretValue).toBeNull();
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].secretValue).toBeNull();
+
           done()
         })
       })
+    })
 
-  }) // - bulkCreate
+    it('should store all values if no whitelist is specified', function(done) {
+      var self = this
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul', secretValue: '23'}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].secretValue).toEqual('42')
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].secretValue).toEqual('23')
+
+          done()
+        })
+      })
+    })
+
+    it('saves data with single quote', function(done) {
+      var self = this
+        , quote = "Single'Quote"
+        , data = [{ username: 'Peter', data: quote},
+                  { username: 'Paul', data: quote}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].data).toEqual(quote)
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].data).toEqual(quote)
+
+          done()
+        })
+      })
+    })
+
+    it('saves data with double quote', function(done) {
+      var self = this
+        , quote = 'Double"Quote'
+        , data = [{ username: 'Peter', data: quote},
+                  { username: 'Paul', data: quote}]
 
-    // it('should only store the values passed in the witelist', function(done) {
-    //   var self = this
-    //     , data = { username: 'Peter', secretValue: '42' }
-
-    //   this.User.create(data, ['username']).success(function(user) {
-    //     self.User.find(user.id).success(function(_user) {
-    //       expect(_user.username).toEqual(data.username)
-    //       expect(_user.secretValue).not.toEqual(data.secretValue)
-    //       expect(_user.secretValue).toEqual(null)
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('should store all values if no whitelist is specified', function(done) {
-    //   var self = this
-    //     , data = { username: 'Peter', secretValue: '42' }
-
-    //   this.User.create(data).success(function(user) {
-    //     self.User.find(user.id).success(function(_user) {
-    //       expect(_user.username).toEqual(data.username)
-    //       expect(_user.secretValue).toEqual(data.secretValue)
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('saves data with single quote', function(done) {
-    //   var quote = "single'quote"
-    //     , self  = this
-
-    //   this.User.create({ data: quote }).success(function(user) {
-    //     expect(user.data).toEqual(quote, 'memory single quote')
-
-    //     self.User.find({where: { id: user.id }}).success(function(user) {
-    //       expect(user.data).toEqual(quote, 'SQL single quote')
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('saves data with double quote', function(done) {
-    //   var quote = 'double"quote'
-    //     , self  = this
-
-    //   this.User.create({ data: quote }).success(function(user) {
-    //     expect(user.data).toEqual(quote, 'memory double quote')
-
-    //     self.User.find({where: { id: user.id }}).success(function(user) {
-    //       expect(user.data).toEqual(quote, 'SQL double quote')
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('saves stringified JSON data', function(done) {
-    //   var json = JSON.stringify({ key: 'value' })
-    //     , self = this
-
-    //   this.User.create({ data: json }).success(function(user) {
-    //     expect(user.data).toEqual(json, 'memory data')
-    //     self.User.find({where: { id: user.id }}).success(function(user) {
-    //       expect(user.data).toEqual(json, 'SQL data')
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('stores the current date in createdAt', function(done) {
-    //   this.User.create({ username: 'foo' }).success(function(user) {
-    //     expect(parseInt(+user.createdAt/5000)).toEqual(parseInt(+new Date()/5000))
-    //     done()
-    //   })
-    // })
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].data).toEqual(quote)
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].data).toEqual(quote)
+
+          done()
+        })
+      })
+    })
+
+    it('saves stringified JSON data', function(done) {
+      var self = this
+        , json = JSON.stringify({ key: 'value' })
+        , data = [{ username: 'Peter', data: json},
+                  { username: 'Paul', data: json}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].data).toEqual(json)
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].data).toEqual(json)
+
+          done()
+        })
+      })
+    })
+
+    it('stores the current date in createdAt', function(done) {
+      var self = this
+        , data = [{ username: 'Peter'},
+                  { username: 'Paul'}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(parseInt(+users[0].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+
+          expect(users[1].username).toEqual("Paul")
+          expect(parseInt(+users[1].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+
+          done()
+        })
+      })
+    })
+
+  }) // - bulkCreate
 
   describe('find', function find() {
     before(function(done) {