Merge pull request #6467 from lineus/fix-6439-v4

add fix for #6439 to 4.x

Author: vkarpov15

lib/services/query/castUpdate.js

@@ -193,7 +193,7 @@ function walkUpdatePath(schema, obj, op, strict, context, pref) {
           (utils.isObject(val) && Object.keys(val).length === 0);
       }
     } else {
-      var checkPath = (key === '$each' || key === '$or' || key === '$and') ?
+      var checkPath = (key === '$each' || key === '$or' || key === '$and' || key === '$in') ?
         pref : prefix + key;
       schematype = schema._getSchema(checkPath);
 

test/query.test.js

@@ -918,6 +918,50 @@ describe('Query', function() {
       done();
     });
 
+    it('doesn\'t wipe out $in (gh-6439)', function(done) {
+      var embeddedSchema = new Schema({
+        name: String
+      }, { _id: false });
+
+      var catSchema = new Schema({
+        name: String,
+        props: [embeddedSchema]
+      });
+
+      var Cat = db.model('gh6439', catSchema);
+      var kitty = new Cat({
+        name: 'Zildjian',
+        props: [
+          { name: 'invalid' },
+          { name: 'abc' },
+          { name: 'def' }
+        ]
+      });
+
+      kitty.save(function(err) {
+        assert.ifError(err);
+        var cond = { _id: kitty._id };
+        var update = {
+          $pull: {
+            props: {
+              $in: [
+                { name: 'invalid' },
+                { name: 'def' }
+              ]
+            }
+          }
+        };
+        Cat.update(cond, update, function(err) {
+          assert.ifError(err);
+          Cat.findOne(cond, function(err, found) {
+            assert.ifError(err);
+            assert.strictEqual(found.props[0].name, 'abc');
+            done();
+          });
+        });
+      });
+    });
+
     it('subdocument array with $ne: null should not throw', function(done) {
       var query = new Query({}, {}, null, p1.collection);
       var Product = db.model('Product');