Skip to content

fix(@mongodb-js/compass-schema-validation): Pass full namespace to updateCollection instead of passing collMod option #2426

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Aug 27, 2021
Merged

fix(@mongodb-js/compass-schema-validation): Pass full namespace to updateCollection instead of passing collMod option #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
042d7ad
fix(mongodb-data-service): Change merge order to restore pre-typescri…
gribnoysup Aug 27, 2021
e6a7206
fix(@mongodb-js/compass-schema-validation, mongodb-data-service): Pas…
gribnoysup Aug 27, 2021
ce9bc40
chore(mongodb-data-service): One "explicitly" is more than enough
gribnoysup Aug 27, 2021
a9327f3
chore: More typo fixes
gribnoysup Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/compass-schema-validation/src/modules/validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,9 +471,8 @@ export const saveValidation = (validation) => {
'schema-validation-saved'
);
dataService.updateCollection(
namespace.database,
`${namespace.database}.${namespace.collection}`,
{
collMod: namespace.collection,
validator: savedValidation.validator,
validationAction: savedValidation.validationAction,
validationLevel: savedValidation.validationLevel
Expand Down
9 changes: 7 additions & 2 deletions packages/data-service/src/native-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,14 +1102,19 @@ class NativeClient extends EventEmitter {
*/
updateCollection(
ns: string,
flags: Document,
// Collection name to update that will be passed to the collMod command will
// be derived from the provided namespace, this is why we are explicitly
// prohibiting to pass collMod flag here
flags: Document & { collMod?: never },
callback: Callback<Document>
): void {
const collectionName = this._collectionName(ns);
const db = this.client.db(this._databaseName(ns));
// Order of arguments is important here, collMod is a command name and it
// should always be the first one in the object
const command = {
...flags,
collMod: collectionName,
...flags,
};
db.command(command, (error, result) => {
if (error) {
Expand Down