Merge pull request #1888 from mohlman3/bugfix/field_mapping_same_name

Allow field names to be same as property name

lib/instance.js

@@ -555,7 +555,7 @@ module.exports = (function() {
               }
               }
 
 
               // Field name mapping
               // Field name mapping
-              if (self.Model.rawAttributes[attr].field) {
+              if (self.Model.rawAttributes[attr].field && self.Model.rawAttributes[attr].field !== attr) {
                 values[self.Model.rawAttributes[attr].field] = values[attr];
                 values[self.Model.rawAttributes[attr].field] = values[attr];
                 delete values[attr];
                 delete values[attr];
               }
               }

test/model/attributes.test.js

@@ -63,7 +63,11 @@ describe(Support.getTestDialectTeaser("Model"), function () {
           text: {
           text: {
             type: DataTypes.STRING,
             type: DataTypes.STRING,
             field: 'comment_text'
             field: 'comment_text'
-          }
+          },
+		  notes: {
+			type: DataTypes.STRING,
+			field: 'notes'
+		  }
         }, {
         }, {
           tableName: 'comments',
           tableName: 'comments',
           timestamps: false
           timestamps: false
@@ -120,7 +124,10 @@ describe(Support.getTestDialectTeaser("Model"), function () {
             },
             },
             comment_text: {
             comment_text: {
               type: DataTypes.STRING
               type: DataTypes.STRING
-            }
+            },
+			notes: {
+			  type: DataTypes.STRING
+			}
           })
           })
         ]);
         ]);
       });
       });
@@ -247,6 +254,30 @@ describe(Support.getTestDialectTeaser("Model"), function () {
           });
           });
         });
         });
       });
       });
+	  
+	  it('field names that are the same as property names should create, update, and read correctly', function () {
+        var self = this;
+
+        return this.Comment.create({
+          notes: 'Foobar'
+        }).then(function () {
+          return self.Comment.find({
+            limit: 1
+          });
+        }).then(function (comment) {
+          expect(comment.get('notes')).to.equal('Foobar');
+          return comment.updateAttributes({
+            notes: 'Barfoo'
+          });
+        }).then(function () {
+          return self.Comment.find({
+            limit: 1
+          });
+        }).then(function (comment) {
+          expect(comment.get('notes')).to.equal('Barfoo');
+        });
+      });
+	  
     });
     });
 
 
     describe('types', function () {
     describe('types', function () {