fix(query-generator): correctly treat projection inversion in include default scope (#10597)

Fixes #10399

lib/dialects/abstract/query-generator.js

@@ -1425,6 +1425,7 @@ class QueryGenerator {
 
     // includeIgnoreAttributes is used by aggregate functions
     if (topLevelInfo.options.includeIgnoreAttributes !== false) {
+      include.model._expandAttributes(include);
       const includeAttributes = include.attributes.map(attr => {
         let attrAs = attr;
         let verbatim = false;

lib/model.js

@@ -3082,19 +3082,20 @@ class Model {
   }
 
   static _expandAttributes(options) {
-    if (_.isPlainObject(options.attributes)) {
-      let attributes = Object.keys(this.rawAttributes);
-
-      if (options.attributes.exclude) {
-        attributes = attributes.filter(elem => !options.attributes.exclude.includes(elem));
-      }
+    if (!_.isPlainObject(options.attributes)) {
+      return;
+    }
+    let attributes = Object.keys(this.rawAttributes);
 
-      if (options.attributes.include) {
-        attributes = attributes.concat(options.attributes.include);
-      }
+    if (options.attributes.exclude) {
+      attributes = attributes.filter(elem => !options.attributes.exclude.includes(elem));
+    }
 
-      options.attributes = attributes;
+    if (options.attributes.include) {
+      attributes = attributes.concat(options.attributes.include);
     }
+
+    options.attributes = attributes;
   }
 
   // Inject _scope into options.

test/integration/model/scope/find.test.js

@@ -46,6 +46,18 @@ describe(Support.getTestDialectTeaser('Model'), () => {
         }
       });
 
+      this.DefaultScopeExclude = this.sequelize.define('DefaultScopeExclude', {
+        name: Sequelize.STRING
+      }, {
+        defaultScope: {
+          attributes: {
+            exclude: ['name']
+          }
+        }
+      });
+
+      this.ScopeMe.hasMany(this.DefaultScopeExclude);
+
       return this.sequelize.sync({ force: true }).then(() => {
         const records = [
           { username: 'tony', email: 'tony@sequelizejs.com', access_level: 3, other_value: 7, parent_id: 1 },
@@ -119,5 +131,11 @@ describe(Support.getTestDialectTeaser('Model'), () => {
         expect(user.username).to.equal('fake');
       });
     });
+
+    it('should work when included with default scope', function() {
+      return this.ScopeMe.findOne({
+        include: [this.DefaultScopeExclude]
+      });
+    });
   });
 });