fixed method signatures

lib/dao-factory.js

@@ -643,8 +643,8 @@ module.exports = (function() {
    * multiple records
    * multiple records
    */
    */
   DAOFactory.prototype.bulkCreate = function(records, fieldsOrOptions, options) {
   DAOFactory.prototype.bulkCreate = function(records, fieldsOrOptions, options) {
-    Utils.validateParameter(fieldsOrOptions, Object, { deprecated: Array, optional: true, index: 1, method: 'DAOFactory#bulkCreate' })
-    Utils.validateParameter(options, 'undefined', { deprecated: Object, optional: true, index: 2, method: 'DAOFactory#bulkCreate' })
+    Utils.validateParameter(fieldsOrOptions, Object, { deprecated: Array, optional: true, index: 2, method: 'DAOFactory#bulkCreate' })
+    Utils.validateParameter(options, 'undefined', { deprecated: Object, optional: true, index: 3, method: 'DAOFactory#bulkCreate' })
 
 
     options = Utils._.extend({
     options = Utils._.extend({
       validate: false,
       validate: false,

test/dao-factory.test.js

@@ -874,7 +874,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       var self = this
       var self = this
         , data = { username: 'Peter', secretValue: '42' }
         , data = { username: 'Peter', secretValue: '42' }
 
 
-      this.User.create(data, ['username']).success(function(user) {
+      this.User.create(data, { fields: ['username'] }).success(function(user) {
         self.User.find(user.id).success(function(_user) {
         self.User.find(user.id).success(function(_user) {
           expect(_user.username).to.equal(data.username)
           expect(_user.username).to.equal(data.username)
           expect(_user.secretValue).not.to.equal(data.secretValue)
           expect(_user.secretValue).not.to.equal(data.secretValue)
@@ -1107,7 +1107,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         , data = [{ username: 'Peter', secretValue: '42' },
         , data = [{ username: 'Peter', secretValue: '42' },
                   { username: 'Paul', secretValue: '23'}]
                   { username: 'Paul', secretValue: '23'}]
 
 
-      this.User.bulkCreate(data, ['username']).success(function() {
+      this.User.bulkCreate(data, { fields: ['username'] }).success(function() {
         self.User.findAll({order: 'id'}).success(function(users) {
         self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).to.equal(2)
           expect(users.length).to.equal(2)
           expect(users[0].username).to.equal("Peter")
           expect(users[0].username).to.equal("Peter")
@@ -1228,7 +1228,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           {name: 'foo', code: '123'},
           {name: 'foo', code: '123'},
           {code: '1234'},
           {code: '1234'},
           {name: 'bar', code: '1'}
           {name: 'bar', code: '1'}
-        ], null, {validate: true}).error(function(errors) {
+        ], { validate: true }).error(function(errors) {
           expect(errors).to.not.be.null
           expect(errors).to.not.be.null
           expect(errors).to.be.instanceof(Array)
           expect(errors).to.be.instanceof(Array)
           expect(errors).to.have.length(2)
           expect(errors).to.have.length(2)
@@ -1262,7 +1262,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         Tasks.bulkCreate([
         Tasks.bulkCreate([
           {name: 'foo', code: '123'},
           {name: 'foo', code: '123'},
           {code: '1234'}
           {code: '1234'}
-        ], ['code'], {validate: true}).success(function() {
+        ], { fields: ['code'], validate: true }).success(function() {
           // we passed!
           // we passed!
           done()
           done()
         })
         })

test/dao.test.js

@@ -291,7 +291,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
     it('with array', function(done) {
     it('with array', function(done) {
       var self = this
       var self = this
       this.User.find(1).complete(function(err, user1) {
       this.User.find(1).complete(function(err, user1) {
-        user1.increment(['aNumber'], 2).complete(function() {
+        user1.increment(['aNumber'], { by: 2 }).complete(function() {
           self.User.find(1).complete(function(err, user3) {
           self.User.find(1).complete(function(err, user3) {
             expect(user3.aNumber).to.be.equal(2)
             expect(user3.aNumber).to.be.equal(2)
             done()
             done()
@@ -303,7 +303,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
     it('with single field', function(done) {
     it('with single field', function(done) {
       var self = this
       var self = this
       this.User.find(1).complete(function(err, user1) {
       this.User.find(1).complete(function(err, user1) {
-        user1.increment('aNumber', 2).complete(function() {
+        user1.increment('aNumber', { by: 2 }).complete(function() {
           self.User.find(1).complete(function(err, user3) {
           self.User.find(1).complete(function(err, user3) {
             expect(user3.aNumber).to.be.equal(2)
             expect(user3.aNumber).to.be.equal(2)
             done()
             done()
@@ -332,7 +332,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
           user2.updateAttributes({
           user2.updateAttributes({
             aNumber: user2.aNumber + 1
             aNumber: user2.aNumber + 1
           }).complete(function () {
           }).complete(function () {
-            user1.increment(['aNumber'], 2).complete(function() {
+            user1.increment(['aNumber'], { by: 2 }).complete(function() {
               self.User.find(1).complete(function(err, user5) {
               self.User.find(1).complete(function(err, user5) {
                 expect(user5.aNumber).to.be.equal(3)
                 expect(user5.aNumber).to.be.equal(3)
                 done()
                 done()
@@ -353,16 +353,16 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
           })
           })
         })
         })
 
 
-        user1.increment(['aNumber'], 2).complete(_done)
-        user1.increment(['aNumber'], 2).complete(_done)
-        user1.increment(['aNumber'], 2).complete(_done)
+        user1.increment(['aNumber'], { by: 2 }).complete(_done)
+        user1.increment(['aNumber'], { by: 2 }).complete(_done)
+        user1.increment(['aNumber'], { by: 2 }).complete(_done)
       })
       })
     })
     })
 
 
     it('with key value pair', function(done) {
     it('with key value pair', function(done) {
       var self = this
       var self = this
       this.User.find(1).complete(function(err, user1) {
       this.User.find(1).complete(function(err, user1) {
-        user1.increment({ 'aNumber': 1, 'bNumber': 2}).success(function() {
+        user1.increment({ 'aNumber': 1, 'bNumber': 2 }).success(function() {
           self.User.find(1).complete(function (err, user3) {
           self.User.find(1).complete(function (err, user3) {
             expect(user3.aNumber).to.be.equal(1)
             expect(user3.aNumber).to.be.equal(1)
             expect(user3.bNumber).to.be.equal(2)
             expect(user3.bNumber).to.be.equal(2)
@@ -381,7 +381,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
         User.create({aNumber: 1}).success(function (user) {
         User.create({aNumber: 1}).success(function (user) {
           var oldDate = user.updatedAt
           var oldDate = user.updatedAt
           setTimeout(function () {
           setTimeout(function () {
-            user.increment('aNumber', 1).success(function() {
+            user.increment('aNumber', { by: 1 }).success(function() {
               User.find(1).success(function (user) {
               User.find(1).success(function (user) {
                 expect(user.updatedAt).to.be.afterTime(oldDate)
                 expect(user.updatedAt).to.be.afterTime(oldDate)
                 done()
                 done()
@@ -423,7 +423,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
     it('with array', function(done) {
     it('with array', function(done) {
       var self = this
       var self = this
       this.User.find(1).complete(function(err, user1) {
       this.User.find(1).complete(function(err, user1) {
-        user1.decrement(['aNumber'], 2).complete(function() {
+        user1.decrement(['aNumber'], { by: 2 }).complete(function() {
           self.User.find(1).complete(function(err, user3) {
           self.User.find(1).complete(function(err, user3) {
             expect(user3.aNumber).to.be.equal(-2)
             expect(user3.aNumber).to.be.equal(-2)
             done()
             done()
@@ -435,7 +435,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
     it('with single field', function(done) {
     it('with single field', function(done) {
       var self = this
       var self = this
       this.User.find(1).complete(function(err, user1) {
       this.User.find(1).complete(function(err, user1) {
-        user1.decrement('aNumber', 2).complete(function() {
+        user1.decrement('aNumber', { by: 2 }).complete(function() {
           self.User.find(1).complete(function(err, user3) {
           self.User.find(1).complete(function(err, user3) {
             expect(user3.aNumber).to.be.equal(-2)
             expect(user3.aNumber).to.be.equal(-2)
             done()
             done()
@@ -464,7 +464,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
           user2.updateAttributes({
           user2.updateAttributes({
             aNumber: user2.aNumber + 1
             aNumber: user2.aNumber + 1
           }).complete(function () {
           }).complete(function () {
-            user1.decrement(['aNumber'], 2).complete(function() {
+            user1.decrement(['aNumber'], { by: 2 }).complete(function() {
               self.User.find(1).complete(function(err, user5) {
               self.User.find(1).complete(function(err, user5) {
                 expect(user5.aNumber).to.be.equal(-1)
                 expect(user5.aNumber).to.be.equal(-1)
                 done()
                 done()
@@ -485,9 +485,9 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
           })
           })
         })
         })
 
 
-        user1.decrement(['aNumber'], 2).complete(_done)
-        user1.decrement(['aNumber'], 2).complete(_done)
-        user1.decrement(['aNumber'], 2).complete(_done)
+        user1.decrement(['aNumber'], { by: 2 }).complete(_done)
+        user1.decrement(['aNumber'], { by: 2 }).complete(_done)
+        user1.decrement(['aNumber'], { by: 2 }).complete(_done)
       })
       })
     })
     })
 
 
@@ -513,7 +513,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
         User.create({aNumber: 1}).success(function (user) {
         User.create({aNumber: 1}).success(function (user) {
           var oldDate = user.updatedAt
           var oldDate = user.updatedAt
           setTimeout(function () {
           setTimeout(function () {
-            user.decrement('aNumber', 1).success(function() {
+            user.decrement('aNumber', { by: 1 }).success(function() {
               User.find(1).success(function (user) {
               User.find(1).success(function (user) {
                 expect(user.updatedAt).to.be.afterTime(oldDate)
                 expect(user.updatedAt).to.be.afterTime(oldDate)
                 done()
                 done()

test/hooks.test.js

@@ -101,7 +101,7 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
                   this.User.bulkCreate([
                   this.User.bulkCreate([
                     {username: 'Bob', mood: 'cold'},
                     {username: 'Bob', mood: 'cold'},
                     {username: 'Tobi', mood: 'hot'}
                     {username: 'Tobi', mood: 'hot'}
-                  ], [], {hooks: true}).success(function(bulkUsers) {
+                  ], { fields: [], hooks: true }).success(function(bulkUsers) {
                     expect(beforeBulkCreate).to.be.true
                     expect(beforeBulkCreate).to.be.true
                     expect(afterBulkCreate).to.be.true
                     expect(afterBulkCreate).to.be.true
                     expect(bulkUsers).to.be.instanceof(Array)
                     expect(bulkUsers).to.be.instanceof(Array)
@@ -268,7 +268,7 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
                   this.User.bulkCreate([
                   this.User.bulkCreate([
                     {username: 'Bob', mood: 'cold'},
                     {username: 'Bob', mood: 'cold'},
                     {username: 'Tobi', mood: 'hot'}
                     {username: 'Tobi', mood: 'hot'}
-                  ], null, {hooks: true}).success(function(bulkUsers) {
+                  ], { hooks: true }).success(function(bulkUsers) {
                     expect(beforeBulkCreate).to.be.true
                     expect(beforeBulkCreate).to.be.true
                     expect(afterBulkCreate).to.be.true
                     expect(afterBulkCreate).to.be.true
                     expect(bulkUsers).to.be.instanceof(Array)
                     expect(bulkUsers).to.be.instanceof(Array)
@@ -4320,7 +4320,7 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
           fn()
           fn()
         })
         })
 
 
-        this.User.bulkCreate([{aNumber: 5}, {aNumber: 7}, {aNumber: 3}], ['aNumber'], {hooks: true}).success(function(records) {
+        this.User.bulkCreate([{aNumber: 5}, {aNumber: 7}, {aNumber: 3}], { fields: ['aNumber'], hooks: true }).success(function(records) {
           records.forEach(function(record) {
           records.forEach(function(record) {
             expect(record.username).to.equal('User' + record.id)
             expect(record.username).to.equal('User' + record.id)
             expect(record.beforeHookTest).to.be.true
             expect(record.beforeHookTest).to.be.true
@@ -4354,7 +4354,7 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
           fn()
           fn()
         })
         })
 
 
-        this.User.bulkCreate([{aNumber: 5}, {aNumber: 7}, {aNumber: 3}], ['aNumber'], {hooks: true}).error(function(err) {
+        this.User.bulkCreate([{aNumber: 5}, {aNumber: 7}, {aNumber: 3}], { fields: ['aNumber'], hooks: true }).error(function(err) {
           expect(err).to.equal('You shall not pass!')
           expect(err).to.equal('You shall not pass!')
           expect(beforeBulkCreate).to.be.true
           expect(beforeBulkCreate).to.be.true
           expect(afterBulkCreate).to.be.false
           expect(afterBulkCreate).to.be.false
@@ -5272,7 +5272,7 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
           fn()
           fn()
         })
         })
 
 
-        this.User.bulkCreate([{aNumber: 1}, {aNumber: 1}, {aNumber: 1}], ['aNumber']).success(function() {
+        this.User.bulkCreate([{aNumber: 1}, {aNumber: 1}, {aNumber: 1}], { fields: ['aNumber'] }).success(function() {
           self.User.update({aNumber: 10}, {aNumber: 1}, {hooks: true}).error(function(err) {
           self.User.update({aNumber: 10}, {aNumber: 1}, {hooks: true}).error(function(err) {
             expect(err).to.equal('You shall not pass!')
             expect(err).to.equal('You shall not pass!')
             expect(beforeBulk).to.be.true
             expect(beforeBulk).to.be.true
@@ -6059,7 +6059,7 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
           fn()
           fn()
         })
         })
 
 
-        this.User.bulkCreate([{aNumber: 1}, {aNumber: 1}, {aNumber: 1}], ['aNumber']).success(function() {
+        this.User.bulkCreate([{aNumber: 1}, {aNumber: 1}, {aNumber: 1}], { fields: ['aNumber'] }).success(function() {
           self.User.destroy({aNumber: 1}, {hooks: true}).error(function(err) {
           self.User.destroy({aNumber: 1}, {hooks: true}).error(function(err) {
             expect(err).to.equal('You shall not pass!')
             expect(err).to.equal('You shall not pass!')
             expect(beforeBulk).to.be.true
             expect(beforeBulk).to.be.true

test/promise.test.js

@@ -47,7 +47,7 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
         .find(1)
         .find(1)
         .then(function(user) {
         .then(function(user) {
           expect(user.id).to.equal(1)
           expect(user.id).to.equal(1)
-          return user.increment(['aNumber'], 2)
+          return user.increment(['aNumber'], { by: 2 })
         })
         })
         .then(function(user) {
         .then(function(user) {
           // The following assertion would rock hard, but it's not implemented :(
           // The following assertion would rock hard, but it's not implemented :(
@@ -72,7 +72,7 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
             .then(function (user2) {
             .then(function (user2) {
               return user2
               return user2
                 .updateAttributes({ aNumber: user2.aNumber + 1 })
                 .updateAttributes({ aNumber: user2.aNumber + 1 })
-                .then(function() { return user1.increment(['aNumber'], 2) })
+                .then(function() { return user1.increment(['aNumber'], { by: 2 }) })
                 .then(function() { return self.User.find(1) })
                 .then(function() { return self.User.find(1) })
                 .then(function(user5) {
                 .then(function(user5) {
                   expect(user5.aNumber).to.equal(3)
                   expect(user5.aNumber).to.equal(3)
@@ -112,7 +112,7 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
       this.User
       this.User
         .find(1)
         .find(1)
         .then(function(user1) {
         .then(function(user1) {
-          return user1.decrement(['aNumber'], 2)
+          return user1.decrement(['aNumber'], { by: 2 })
         })
         })
         .then(function(user2) {
         .then(function(user2) {
           return self.User.find(1)
           return self.User.find(1)
@@ -129,7 +129,7 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
       this.User
       this.User
         .find(1)
         .find(1)
         .then(function(user1) {
         .then(function(user1) {
-          return user1.decrement(['aNumber'], 2)
+          return user1.decrement(['aNumber'], { by: 2 })
         })
         })
         .then(function(user3) {
         .then(function(user3) {
           return self.User.find(1)
           return self.User.find(1)
@@ -155,9 +155,9 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
               })
               })
           })
           })
 
 
-          user1.decrement(['aNumber'], 2).done(_done)
-          user1.decrement(['aNumber'], 2).done(_done)
-          user1.decrement(['aNumber'], 2).done(_done)
+          user1.decrement(['aNumber'], { by: 2 }).done(_done)
+          user1.decrement(['aNumber'], { by: 2 }).done(_done)
+          user1.decrement(['aNumber'], { by: 2 }).done(_done)
         })
         })
       })
       })
   })
   })