fix(query): correctly handle $in and required for $pull and update …

…validators Fix #5744
Automattic · Oct 28, 2017 · 85821d9 · 85821d9
1 parent 3b4211e
commit 85821d9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/services/updateValidators.js b/lib/services/updateValidators.js
@@ -33,8 +33,8 @@ module.exports = function(query, schema, castedDoc, options) {
 
   for (var i = 0; i < numKeys; ++i) {
     if (keys[i].charAt(0) === '$') {
-      if (keys[i] === '$push' || keys[i] === '$addToSet' ||
-          keys[i] === '$pull' || keys[i] === '$pullAll') {
+      hasDollarUpdate = true;
+      if (keys[i] === '$push' || keys[i] === '$addToSet') {
         _keys = Object.keys(castedDoc[keys[i]]);
         for (var ii = 0; ii < _keys.length; ++ii) {
           currentUpdate = castedDoc[keys[i]][_keys[ii]];
@@ -55,14 +55,14 @@ module.exports = function(query, schema, castedDoc, options) {
       for (var j = 0; j < numPaths; ++j) {
         var updatedPath = paths[j].replace('.$.', '.0.');
         updatedPath = updatedPath.replace(/\.\$$/, '.0');
-        if (keys[i] === '$set' || keys[i] === '$setOnInsert') {
+        if (keys[i] === '$set' || keys[i] === '$setOnInsert' ||
+            keys[i] === '$pull' || keys[i] === '$pullAll') {
           updatedValues[updatedPath] = flat[paths[j]];
         } else if (keys[i] === '$unset') {
           updatedValues[updatedPath] = undefined;
         }
         updatedKeys[updatedPath] = true;
       }
-      hasDollarUpdate = true;
     }
   }