fix: only allow using minus path to remove auto-selected discriminato…

…rKey from projection Re: #11546
Automattic · Apr 20, 2022 · 6ab6a33 · 6ab6a33
1 parent 5194756
commit 6ab6a33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/queryhelpers.js b/lib/queryhelpers.js
@@ -265,8 +265,10 @@ exports.applyPaths = function applyPaths(fields, schema) {
       return;
     }
 
-    // If set to 0, we're excluding a selected path. See gh-11546
-    if (exclude && type.selected && fields[path] != null && !fields[path]) {
+    // If set to 0, we're explicitly excluding the discriminator key. Can't do this for all fields,
+    // because we have tests that assert that using `-path` to exclude schema-level `select: true`
+    // fields counts as an exclusive projection. See gh-11546
+    if (exclude && type.selected && path === schema.options.discriminatorKey && fields[path] != null && !fields[path]) {
       delete fields[path];
       return;
     }

diff --git a/test/model.discriminator.querying.test.js b/test/model.discriminator.querying.test.js
@@ -318,7 +318,7 @@ describe('model', function() {
     });
 
     describe('findOne', function() {
-      it('when selecting `select: false` field (gh-4629)', async function() {
+      it('when selecting `select: false` field (gh-4629) (gh-11546)', async function() {
         const s = new SecretEvent({ name: 'test', secret: 'test2' });
         await s.save();