Skip to content

Commit c71ba5e

Browse files
authored
Merge pull request #14646 from uditha-g/master
check the value of overwriteModels in options
2 parents 563f293 + 1314b07 commit c71ba5e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/model.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,7 @@ Model.discriminator = function(name, schema, options) {
12351235
const value = utils.isPOJO(options) ? options.value : options;
12361236
const clone = typeof options.clone === 'boolean' ? options.clone : true;
12371237
const mergePlugins = typeof options.mergePlugins === 'boolean' ? options.mergePlugins : true;
1238+
const overwriteModels = typeof options.overwriteModels === 'boolean' ? options.overwriteModels : false;
12381239

12391240
_checkContext(this, 'discriminator');
12401241

@@ -1245,8 +1246,8 @@ Model.discriminator = function(name, schema, options) {
12451246
schema = schema.clone();
12461247
}
12471248

1248-
schema = discriminator(this, name, schema, value, mergePlugins, options.mergeHooks);
1249-
if (this.db.models[name] && !schema.options.overwriteModels) {
1249+
schema = discriminator(this, name, schema, value, mergePlugins, options.mergeHooks, overwriteModels);
1250+
if (this.db.models[name] && !schema.options.overwriteModels && !overwriteModels) {
12501251
throw new OverwriteModelError(name);
12511252
}
12521253

0 commit comments

Comments
 (0)