fix(document): ensure projection with only $slice isn't treated as in…

…clusive for discriminators Fix #4991
Automattic · Dec 6, 2017 · 7b42c15 · 7b42c15
1 parent 7e4077d
commit 7b42c15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -1258,7 +1258,8 @@ Document.prototype.isSelected = function isSelected(path) {
       if (cur === '_id') {
         continue;
       }
-      if (this.$__.selected[cur] && this.$__.selected[cur].$meta) {
+      var projection = this.$__.selected[cur];
+      if (projection && (projection.$meta || projection.$slice)) {
         continue;
       }
       inclusive = !!this.$__.selected[cur];

diff --git a/test/model.discriminator.querying.test.js b/test/model.discriminator.querying.test.js
@@ -1023,13 +1023,13 @@ describe('model', function() {
           var Discriminator = Base.discriminator('gh4991_A1', discriminatorSchema);
 
           var obj = { propA: 'Hi', propB: 'test', array: ['a', 'b'] };
-          Discriminator.create(obj, function(error, doc) {
+          Discriminator.create(obj, function(error) {
             assert.ifError(error);
             Base.find().slice('array', 1).exec(function(error, docs) {
               assert.equal(docs.length, 1);
               assert.equal(docs[0].propA, 'Hi');
               done();
-            })
+            });
           });
         });