increment and decrement added

lib/dao.js

@@ -237,6 +237,23 @@ module.exports = (function() {
     }
     }
   }
   }
 
 
+  DAO.prototype.increment = function(fields, count) {
+    var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id,
+      values = {}
+
+    if (count === undefined) count = 1;
+
+    Utils._.each(fields, function (field) {
+      values[field] = count
+    })
+
+    return this.QueryInterface.increment(this, this.__factory.tableName, values, identifier)
+  }
+
+  DAO.prototype.decrement = function (fields, count) {
+    return this.increment(fields, 0 - count);
+  }
+
   DAO.prototype.equals = function(other) {
   DAO.prototype.equals = function(other) {
     var result = true
     var result = true
       , self   = this
       , self   = this

lib/dialects/mysql/query-generator.js

@@ -258,6 +258,28 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
       return Utils._.template(query)(replacements)
     },
     },
 
 
+    incrementQuery: function (tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> "
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value  = attrValueHash[key]
+          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+
+        values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + " + " +Utils.escape(_value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)      
+    },
+
     addIndexQuery: function(tableName, attributes, options) {
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
       var transformedAttributes = attributes.map(function(attribute) {
         if(typeof attribute === 'string') {
         if(typeof attribute === 'string') {

lib/query-interface.js

@@ -202,6 +202,11 @@ module.exports = (function() {
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
   }
   }
 
 
+  QueryInterface.prototype.increment = function(dao, tableName, values, identifier) {
+    var sql = this.QueryGenerator.incrementQuery(tableName, values, identifier);
+    return queryAndEmit.call(this, [sql, dao], 'increment');
+  }
+
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
     var self = this
     var self = this
 
 

spec/dao.spec.js

@@ -2,6 +2,7 @@ if(typeof require === 'function') {
   const buster  = require("buster")
   const buster  = require("buster")
       , Helpers = require('./buster-helpers')
       , Helpers = require('./buster-helpers')
       , dialect = Helpers.getTestDialect()
       , dialect = Helpers.getTestDialect()
+      , _ = require('underscore')
 }
 }
 
 
 buster.spec.expose()
 buster.spec.expose()
@@ -34,6 +35,124 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
     })
     })
   })
   })
 
 
+  describe('increment', function () {
+    before(function (done) {
+      this.User.create({ id: 1, aNumber: 0 }).done(done)
+    });
+
+    it('', function (done) {
+      var self = this;
+
+      // Select something
+      this.User.find(1).done(function (err, user1) {
+        user1.increment(['aNumber'], 2).done(function (err, user2) {
+
+          self.User.find(1).done(function (err, user3) {
+            expect(user3.aNumber).toBe(user1.aNumber + 2);
+            done();
+          });
+        });
+      });
+    });
+
+    it('should still work right with other concurrent updates', function (done) {
+      var self = this;
+      // Select something
+      this.User.find(1).done(function (err, user1) {
+        // Select the user again (simulating a concurrent query)
+        self.User.find(1).done(function (err, user2) {
+          user2.updateAttributes({
+            aNumber: user2.aNumber + 1
+          }).done(function (err, user3) {
+            user1.increment(['aNumber'], 2).done(function (err, user4) {
+
+              self.User.find(1).done(function (err, user5) {
+                expect(user5.aNumber).toBe(user1.aNumber + 3);
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    it('should still work right with other concurrent increments', function (done) {
+      var self = this;
+      // Select something
+      this.User.find(1).done(function (err, user1) {
+        var _done = _.after(3, function () {
+          self.User.find(1).done(function (err, user2) {
+            expect(user2.aNumber).toEqual(6);
+            done();
+          })
+        });
+
+        user1.increment(['aNumber'], 2).done(_done);
+        user1.increment(['aNumber'], 2).done(_done);
+        user1.increment(['aNumber'], 2).done(_done);
+      });
+    });
+  });
+
+  describe('decrement', function () {
+    before(function (done) {
+      this.User.create({ id: 1, aNumber: 0 }).done(done)
+    });
+
+    it('', function (done) {
+      var self = this;
+
+      // Select something
+      this.User.find(1).done(function (err, user1) {
+        user1.decrement(['aNumber'], 2).done(function (err, user2) {
+
+          self.User.find(1).done(function (err, user3) {
+            expect(user3.aNumber).toBe(user1.aNumber - 2);
+            done();
+          });
+        });
+      });
+    });
+
+    it('should still work right with other concurrent updates', function (done) {
+      var self = this;
+      // Select something
+      this.User.find(1).done(function (err, user1) {
+        // Select the user again (simulating a concurrent query)
+        self.User.find(1).done(function (err, user2) {
+          user2.updateAttributes({
+            aNumber: user2.aNumber + 1
+          }).done(function (err, user3) {
+            user1.decrement(['aNumber'], 2).done(function (err, user4) {
+
+              self.User.find(1).done(function (err, user5) {
+                expect(user5.aNumber).toBe(user1.aNumber -1);
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    it('should still work right with other concurrent increments', function (done) {
+      var self = this;
+      // Select something
+      this.User.find(1).done(function (err, user1) {
+        var _done = _.after(3, function () {
+          self.User.find(1).done(function (err, user2) {
+            expect(user2.aNumber).toEqual(-6);
+            done();
+          })
+        });
+
+        user1.decrement(['aNumber'], 2).done(_done);
+        user1.decrement(['aNumber'], 2).done(_done);
+        user1.decrement(['aNumber'], 2).done(_done);
+      });
+    });
+  });
+/*
   describe('default values', function() {
   describe('default values', function() {
     describe('current date', function() {
     describe('current date', function() {
       it('should store a date in touchedAt', function() {
       it('should store a date in touchedAt', function() {
@@ -169,4 +288,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       }.bind(this))
       }.bind(this))
     })
     })
   })
   })
+  */
 })
 })