Merge pull request #584 from mekanics/find-para-include-fix

Include no longer overwrites attributes in find (thanks to @mekanics)

lib/dialects/mysql/query-generator.js

@@ -186,7 +186,7 @@ module.exports = (function() {
       options.attributes = options.attributes || '*'
       options.attributes = options.attributes || '*'
 
 
       if (options.include) {
       if (options.include) {
-        var optAttributes = [options.table + '.*']
+        var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
 
 
         options.include.forEach(function(include) {
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {

lib/dialects/postgres/query-generator.js

@@ -233,7 +233,7 @@ module.exports = (function() {
       options.attributes = options.attributes || '*'
       options.attributes = options.attributes || '*'
 
 
       if (options.include) {
       if (options.include) {
-        var optAttributes = [options.table + '.*']
+        var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
 
 
         options.include.forEach(function(include) {
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {

spec/dao-factory.spec.js

@@ -763,6 +763,37 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       }.bind(this))
       }.bind(this))
     })
     })
 
 
+    it('returns the selected fields and all fields of the included table as instance.selectedValues', function(done) {
+      this.Mission = this.sequelize.define('Mission', {
+        title:  {type: Sequelize.STRING, defaultValue: 'a mission!!'},
+        foo:    {type: Sequelize.INTEGER, defaultValue: 2},
+      })
+
+      this.Mission.belongsTo(this.User)
+      this.User.hasMany(this.Mission)
+
+      this.sequelize.sync({ force: true }).complete(function() {
+        this.Mission.create()
+        .success(function(mission) {
+          this.User.create({
+            username: 'John DOE'
+          }).success(function(user) {
+            mission.setUser(user)
+            .success(function() {
+              this.User.find({
+                where: { username: 'John DOE' },
+                attributes: ['username'],
+                include: [this.Mission]
+              }).success(function(user) {
+                expect(user.selectedValues).toEqual({ username: 'John DOE' })
+                done()
+              })
+            }.bind(this))
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+
     it('always honors ZERO as primary key', function(_done) {
     it('always honors ZERO as primary key', function(_done) {
       var permutations = [
       var permutations = [
           0,
           0,