Merge pull request #3941 from Znarkus/master

Refactored away duplicate code in Instance::get()

lib/instance.js

@@ -214,19 +214,7 @@ Instance.prototype.get = function(key, options) {
 
 
     for (_key in this.dataValues) {
     for (_key in this.dataValues) {
       if (!values.hasOwnProperty(_key) && this.dataValues.hasOwnProperty(_key)) {
       if (!values.hasOwnProperty(_key) && this.dataValues.hasOwnProperty(_key)) {
-        if (options && options.plain && this.options.include && this.options.includeNames.indexOf(_key) !== -1) {
-          if (Array.isArray(this.dataValues[_key])) {
-            values[_key] = this.dataValues[_key].map(function (instance) {
-              return instance.get({plain: options.plain});
-            });
-          } else if (this.dataValues[_key] instanceof Instance) {
-            values[_key] = this.dataValues[_key].get({plain: options.plain});
-          } else {
-            values[_key] = this.dataValues[_key];
-          }
-        } else {
-          values[_key] = this.dataValues[_key];
-        }
+        values[_key] = this.get(_key, options);
       }
       }
     }
     }
     return values;
     return values;