fix: alternative fix for allowing empty update on upsert

Fix #9188
Automattic · Aug 14, 2020 · 7646d9e · 7646d9e
1 parent bd455c4
commit 7646d9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/helpers/model/castBulkWrite.js b/lib/helpers/model/castBulkWrite.js
@@ -74,7 +74,7 @@ module.exports = function castBulkWrite(originalModel, op, options) {
           strict: strict,
           overwrite: false,
           upsert: op['updateOne'].upsert
-        });
+        }, model, op['updateOne']['filter']);
       } catch (error) {
         return callback(error, null);
       }
@@ -121,7 +121,7 @@ module.exports = function castBulkWrite(originalModel, op, options) {
           strict: strict,
           overwrite: false,
           upsert: op['updateMany'].upsert
-        });
+        }, model, op['updateMany']['filter']);
 
       } catch (error) {
         return callback(error, null);

diff --git a/lib/helpers/query/castUpdate.js b/lib/helpers/query/castUpdate.js
@@ -105,10 +105,12 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     }
   }
 
-  if (Object.keys(ret).length === 0 && options.upsert) {
+  if (Object.keys(ret).length === 0 &&
+      options.upsert &&
+      Object.keys(filter).length > 0) {
     // Trick the driver into allowing empty upserts to work around
     // https://github.com/mongodb/node-mongodb-native/pull/2490
-    return { $fake: true, toBSON: () => ({}) };
+    return { $setOnInsert: filter };
   }
 
   return ret;