From 941da9f480254d07d33e79259d1ba39abcf44e7c Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Wed, 10 Mar 2021 15:28:05 +0100 Subject: [PATCH 1/2] chore(shell-api): Update deprecation messages for collection crud commands --- packages/shell-api/src/collection.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/shell-api/src/collection.ts b/packages/shell-api/src/collection.ts index 4845973d5c..3a3d2da94f 100644 --- a/packages/shell-api/src/collection.ts +++ b/packages/shell-api/src/collection.ts @@ -598,7 +598,7 @@ export default class Collection extends ShellApiClass { @serverVersions([ServerVersions.earliest, '3.6.0']) async insert(docs: Document | Document[], options: BulkWriteOptions = {}): Promise { printDeprecationWarning( - 'Collection.insert() is deprecated. Use insertOne, insertMany or bulkWrite.', + 'Collection.insert() is deprecated. Use insertOne, insertMany, or bulkWrite.', this._mongo._internalState.context.print ); assertArgsDefined(docs); @@ -710,7 +710,7 @@ export default class Collection extends ShellApiClass { @serverVersions([ServerVersions.earliest, '3.2.0']) async remove(query: Document, options: boolean | RemoveShellOptions = {}): Promise { printDeprecationWarning( - 'Collection.remove() is deprecated. Use deleteOne, deleteMany or bulkWrite.', + 'Collection.remove() is deprecated. Use deleteOne, deleteMany, findOneAndDelete, or bulkWrite.', this._mongo._internalState.context.print ); assertArgsDefined(query); @@ -737,7 +737,9 @@ export default class Collection extends ShellApiClass { @returnsPromise @deprecated save(): Promise { - throw new MongoshInvalidInputError('Collection.save() is deprecated. Use insertOne, insertMany, updateOne or updateMany.'); + throw new MongoshInvalidInputError( + 'Collection.save() is deprecated. Use insertOne, insertMany, updateOne, updateMany, or findAndModify.' + ); } /** @@ -782,7 +784,7 @@ export default class Collection extends ShellApiClass { @serverVersions([ServerVersions.earliest, '3.2.0']) async update(filter: Document, update: Document, options: UpdateOptions & { multi?: boolean } = {}): Promise { printDeprecationWarning( - 'Collection.update() is deprecated. Use updateOne, updateMany or bulkWrite.', + 'Collection.update() is deprecated. Use updateOne, updateMany, findAndModify, or bulkWrite.', this._mongo._internalState.context.print ); assertArgsDefined(update); From 6c0dce6cf3c66e5d9df00096771ec30cf5ae31e1 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 11 Mar 2021 08:51:17 +0100 Subject: [PATCH 2/2] chore(shell-api): Remove deprecated findAndModify from warning text See https://github.com/mongodb-js/mongosh/pull/715/files#r591599426 --- packages/shell-api/src/collection.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shell-api/src/collection.ts b/packages/shell-api/src/collection.ts index 3a3d2da94f..08eefdda17 100644 --- a/packages/shell-api/src/collection.ts +++ b/packages/shell-api/src/collection.ts @@ -738,7 +738,7 @@ export default class Collection extends ShellApiClass { @deprecated save(): Promise { throw new MongoshInvalidInputError( - 'Collection.save() is deprecated. Use insertOne, insertMany, updateOne, updateMany, or findAndModify.' + 'Collection.save() is deprecated. Use insertOne, insertMany, updateOne, or updateMany.' ); } @@ -784,7 +784,7 @@ export default class Collection extends ShellApiClass { @serverVersions([ServerVersions.earliest, '3.2.0']) async update(filter: Document, update: Document, options: UpdateOptions & { multi?: boolean } = {}): Promise { printDeprecationWarning( - 'Collection.update() is deprecated. Use updateOne, updateMany, findAndModify, or bulkWrite.', + 'Collection.update() is deprecated. Use updateOne, updateMany, or bulkWrite.', this._mongo._internalState.context.print ); assertArgsDefined(update);