fix(query-generator): handle field names in scope include (#10718)

sequelize · Apr 8, 2019 · 4c9d18f · 4c9d18f
1 parent 75e363e
commit 4c9d18f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/dialects/abstract/query-generator.js b/lib/dialects/abstract/query-generator.js
@@ -1426,6 +1426,8 @@ class QueryGenerator {
     // includeIgnoreAttributes is used by aggregate functions
     if (topLevelInfo.options.includeIgnoreAttributes !== false) {
       include.model._expandAttributes(include);
+      Utils.mapOptionFieldNames(include, include.model);
+
       const includeAttributes = include.attributes.map(attr => {
         let attrAs = attr;
         let verbatim = false;

diff --git a/test/integration/model/scope/find.test.js b/test/integration/model/scope/find.test.js
@@ -47,7 +47,11 @@ describe(Support.getTestDialectTeaser('Model'), () => {
       });
 
       this.DefaultScopeExclude = this.sequelize.define('DefaultScopeExclude', {
-        name: Sequelize.STRING
+        name: Sequelize.STRING,
+        other_value: {
+          type: Sequelize.STRING,
+          field: 'otherValue'
+        }
       }, {
         defaultScope: {
           attributes: {