Merge pull request #5249 from rmzg/master

Updated the fix for user defined attributes overwriting builtins.

lib/instance.js

@@ -196,10 +196,8 @@ Instance.prototype.get = function(key, options) { // testhint options:none
         return this.dataValues[key];
         return this.dataValues[key];
       }
       }
     }
     }
-		if (this.dataValues) {
 		return this.dataValues[key];
 		return this.dataValues[key];
   }
   }
-  }
 
 
   if (this._hasCustomGetters || (options && options.plain && this.$options.include) || (options && options.clone)) {
   if (this._hasCustomGetters || (options && options.plain && this.$options.include) || (options && options.clone)) {
     var values = {}
     var values = {}

lib/model.js

@@ -925,7 +925,7 @@ Model.prototype.refreshAttributes = function() {
   this.Instance.prototype._hasCustomSetters = Object.keys(this.Instance.prototype._customSetters).length;
   this.Instance.prototype._hasCustomSetters = Object.keys(this.Instance.prototype._customSetters).length;
 
 
   Object.keys(attributeManipulation).forEach((function(key){
   Object.keys(attributeManipulation).forEach((function(key){
-    if (this.Instance.prototype[key] !== undefined) {
+    if (Instance.prototype.hasOwnProperty(key)) {
       this.sequelize.log("Not overriding built-in method from model attribute: " + key);
       this.sequelize.log("Not overriding built-in method from model attribute: " + key);
       return;
       return;
     }
     }