Merge branch 'quiddle-master'

lib/instance.js

@@ -549,7 +549,7 @@ module.exports = (function() {
             if (hookChanged) {
             if (hookChanged) {
               if (options.validate) {
               if (options.validate) {
                 // Validate again
                 // Validate again
-                
+
                 options.skip = _.difference(Object.keys(this.Model.rawAttributes), hookChanged);
                 options.skip = _.difference(Object.keys(this.Model.rawAttributes), hookChanged);
                 return Promise.bind(this).then(function () {
                 return Promise.bind(this).then(function () {
                   // hookValidate rejects with errors, validate returns with errors
                   // hookValidate rejects with errors, validate returns with errors
@@ -840,11 +840,25 @@ module.exports = (function() {
       deprecationWarning: 'Increment expects an object as second parameter. Please pass the incrementor as option! ~> instance.increment(' + JSON.stringify(fields) + ', { by: ' + countOrOptions + ' })'
       deprecationWarning: 'Increment expects an object as second parameter. Please pass the incrementor as option! ~> instance.increment(' + JSON.stringify(fields) + ', { by: ' + countOrOptions + ' })'
     });
     });
 
 
-    var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : { id: this.id }
+    var identifier = this.primaryKeyValues
       , updatedAtAttr = this.Model._timestampAttributes.updatedAt
       , updatedAtAttr = this.Model._timestampAttributes.updatedAt
       , values = {}
       , values = {}
       , where;
       , where;
 
 
+    if (identifier) {
+      for (var attrName in identifier) {
+        // Field name mapping
+        var rawAttribute = this.Model.rawAttributes[attrName];
+        if (rawAttribute.field && rawAttribute.field !== rawAttribute.fieldName) {
+          identifier[this.Model.rawAttributes[attrName].field] = identifier[attrName];
+          delete identifier[attrName];
+        }
+      }
+    }
+    if (identifier === null && this.__options.whereCollection !== null) {
+      identifier = this.__options.whereCollection;
+    }
+
     if (countOrOptions === undefined) {
     if (countOrOptions === undefined) {
       countOrOptions = { by: 1 };
       countOrOptions = { by: 1 };
     } else if (typeof countOrOptions === 'number') {
     } else if (typeof countOrOptions === 'number') {
@@ -873,6 +887,14 @@ module.exports = (function() {
       countOrOptions.attributes[updatedAtAttr] = this.Model.__getTimestamp(updatedAtAttr);
       countOrOptions.attributes[updatedAtAttr] = this.Model.__getTimestamp(updatedAtAttr);
     }
     }
 
 
+    Object.keys(values).forEach(function(attr) {
+      // Field name mapping
+      if (this.Model.rawAttributes[attr] && this.Model.rawAttributes[attr].field && this.Model.rawAttributes[attr].field !== attr) {
+        values[this.Model.rawAttributes[attr].field] = values[attr];
+        delete values[attr];
+      }
+    }, this);
+
     return this.QueryInterface.increment(this, this.Model.getTableName(countOrOptions), values, where, countOrOptions);
     return this.QueryInterface.increment(this, this.Model.getTableName(countOrOptions), values, where, countOrOptions);
   };
   };
 
 

test/integration/model/attributes/field.test.js

@@ -29,6 +29,12 @@ describe(Support.getTestDialectTeaser('Model'), function() {
           name: {
           name: {
             type: DataTypes.STRING,
             type: DataTypes.STRING,
             field: 'full_name'
             field: 'full_name'
+          },
+          taskCount: {
+            type: DataTypes.INTEGER,
+            field: 'task_count',
+            defaultValue: 0,
+            allowNull: false
           }
           }
         }, {
         }, {
           tableName: 'users',
           tableName: 'users',
@@ -96,6 +102,11 @@ describe(Support.getTestDialectTeaser('Model'), function() {
             },
             },
             full_name: {
             full_name: {
               type: DataTypes.STRING
               type: DataTypes.STRING
+            },
+            task_count: {
+              type: DataTypes.INTEGER,
+              allowNull: false,
+              defaultValue: 0
             }
             }
           }),
           }),
           queryInterface.createTable('tasks', {
           queryInterface.createTable('tasks', {
@@ -357,6 +368,12 @@ describe(Support.getTestDialectTeaser('Model'), function() {
         });
         });
       });
       });
 
 
+      it('should work with increment', function () {
+        return this.User.create().then(function (user) {
+          return user.increment('taskCount');
+        });
+      });
+
       it('should work with a simple where', function() {
       it('should work with a simple where', function() {
         var self = this;
         var self = this;