fix: more robust fix for #12513

Automattic · Oct 21, 2022 · 8e33a32 · 8e33a32
1 parent 136d6af
commit 8e33a32
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/lib/helpers/query/castUpdate.js b/lib/helpers/query/castUpdate.js
@@ -43,13 +43,6 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     return obj;
   }
 
-  if (schema.options.strict === 'throw' && obj.hasOwnProperty(schema.options.discriminatorKey)) {
-    if (!options.overwriteDiscriminatorKey) {
-      throw new StrictModeError(schema.options.discriminatorKey);
-    }
-  } else if (!options.overwriteDiscriminatorKey) {
-    delete obj[schema.options.discriminatorKey];
-  }
   if (options.upsert && !options.overwrite) {
     moveImmutableProperties(schema, obj, context);
   }
@@ -92,14 +85,6 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     val = ret[op];
     hasDollarKey = hasDollarKey || op.startsWith('$');
 
-    if (schema.options.strict === 'throw' && typeof val === 'object' && val != null && val.hasOwnProperty(schema.options.discriminatorKey)) {
-      if (!options.overwriteDiscriminatorKey) {
-        throw new StrictModeError(schema.options.discriminatorKey);
-      }
-    } else if (typeof val === 'object' && val != null && !options.overwriteDiscriminatorKey) {
-      delete obj[schema.options.discriminatorKey];
-    }
-
     if (val &&
         typeof val === 'object' &&
         !Buffer.isBuffer(val) &&