From 38db5601f5171a5458abab531463018fecd0dbd8 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 28 Jul 2021 11:33:58 +0200 Subject: [PATCH 1/2] fix(shell-api): include db name in collection print MONGOSH-927 --- packages/shell-api/src/collection.spec.ts | 2 +- packages/shell-api/src/collection.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shell-api/src/collection.spec.ts b/packages/shell-api/src/collection.spec.ts index 8026227c4a..07853cd138 100644 --- a/packages/shell-api/src/collection.spec.ts +++ b/packages/shell-api/src/collection.spec.ts @@ -58,7 +58,7 @@ describe('Collection', () => { const coll = new Collection(mongo as any, db, 'myCollection'); it('toShellResult', async() => { expect((await toShellResult(coll)).type).to.equal('Collection'); - expect((await toShellResult(coll)).printable).to.equal('myCollection'); + expect((await toShellResult(coll)).printable).to.equal('myDB.myCollection'); }); }); }); diff --git a/packages/shell-api/src/collection.ts b/packages/shell-api/src/collection.ts index 5fe34bc136..dfc1b4b55f 100644 --- a/packages/shell-api/src/collection.ts +++ b/packages/shell-api/src/collection.ts @@ -119,7 +119,7 @@ export default class Collection extends ShellApiWithMongoClass { * Internal method to determine what is printed for this class. */ [asPrintable](): string { - return this._name; + return `${this._database.getName()}.${this._name}`; } /** From a1827d60b466ce260ad91921ce8e6afda15fd57e Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 28 Jul 2021 13:41:32 +0200 Subject: [PATCH 2/2] fixup: java shell test changes --- .../java-shell/src/test/resources/collection/ref.expected.txt | 2 +- .../java-shell/src/test/resources/db/getCollection.expected.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/java-shell/src/test/resources/collection/ref.expected.txt b/packages/java-shell/src/test/resources/collection/ref.expected.txt index 275a12ecb5..32e9e096ac 100644 --- a/packages/java-shell/src/test/resources/collection/ref.expected.txt +++ b/packages/java-shell/src/test/resources/collection/ref.expected.txt @@ -1 +1 @@ -collection \ No newline at end of file +admin.collection diff --git a/packages/java-shell/src/test/resources/db/getCollection.expected.txt b/packages/java-shell/src/test/resources/db/getCollection.expected.txt index ea1e6ef94c..10b87300db 100644 --- a/packages/java-shell/src/test/resources/db/getCollection.expected.txt +++ b/packages/java-shell/src/test/resources/db/getCollection.expected.txt @@ -1 +1 @@ -StringResult: does not exist \ No newline at end of file +StringResult: test.does not exist