Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix discriminator type field update for custom discriminator model name #12947

Merged
merged 1 commit into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -5100,7 +5100,9 @@ Query.prototype._castUpdate = function _castUpdate(obj, overwrite) {
if (this._mongooseOptions.overwriteDiscriminatorKey &&
obj[discriminatorKey] != null &&
baseSchema.discriminators) {
const _schema = baseSchema.discriminators[obj[discriminatorKey]];
const _schema = Object.values(baseSchema.discriminators).find(
discriminator => discriminator.discriminatorMapping.value === obj[discriminatorKey]
);
if (_schema != null) {
schema = _schema;
}
Expand Down
4 changes: 2 additions & 2 deletions test/model.update.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3288,10 +3288,10 @@ describe('model: updateOne: ', function() {
const baseModel = db.model('Test', baseSchema);

const aSchema = Schema({ aThing: Number }, { _id: false, id: false });
const aModel = baseModel.discriminator('A', aSchema);
const aModel = baseModel.discriminator('discriminator-A', aSchema, 'A');

const bSchema = new Schema({ bThing: String }, { _id: false, id: false });
const bModel = baseModel.discriminator('B', bSchema);
const bModel = baseModel.discriminator('discriminator-B', bSchema, 'B');

// Model is created as a type A
let doc = await baseModel.create({ type: 'A', aThing: 1 });
Expand Down