From 7a9666619a0ad0baee18dc01593854252710ac4f Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Thu, 31 Mar 2016 11:02:43 -0700 Subject: [PATCH 1/6] DOCS-7476: Comment on: "manual/reference/method/db.cloneCollection.txt" --- source/includes/example-clone-collection.rst | 9 +++++++++ source/reference/command/cloneCollection.txt | 10 +--------- source/reference/method/db.cloneCollection.txt | 5 +++++ 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 source/includes/example-clone-collection.rst diff --git a/source/includes/example-clone-collection.rst b/source/includes/example-clone-collection.rst new file mode 100644 index 00000000000..9b40dfb7050 --- /dev/null +++ b/source/includes/example-clone-collection.rst @@ -0,0 +1,9 @@ +.. code-block:: javascript + + { cloneCollection: "users.profiles", + from: "mongodb.example.net:27017", + query: { active: true } } + +This operation copies the ``profiles`` collection from the ``users`` +database on the server at ``mongodb.example.net``. The operation only +copies documents that satisfy the query ``{ active: true }``. diff --git a/source/reference/command/cloneCollection.txt b/source/reference/command/cloneCollection.txt index 94b35f13fe8..18356afa070 100644 --- a/source/reference/command/cloneCollection.txt +++ b/source/reference/command/cloneCollection.txt @@ -40,12 +40,4 @@ Behavior Example ------- -.. code-block:: javascript - - { cloneCollection: "users.profiles", - from: "mongodb.example.net:27017", - query: { active: true } } - -This operation copies the ``profiles`` collection from the ``users`` -database on the server at ``mongodb.example.net``. The operation only -copies documents that satisfy the query ``{ active: true }``. +..include:: /includes/example-clone-collection.rst \ No newline at end of file diff --git a/source/reference/method/db.cloneCollection.txt b/source/reference/method/db.cloneCollection.txt index b99f98235b2..d1413a47624 100644 --- a/source/reference/method/db.cloneCollection.txt +++ b/source/reference/method/db.cloneCollection.txt @@ -26,3 +26,8 @@ Behavior -------- .. include:: /includes/extracts/cloneCollection-behavior-method.rst + +Example +------- + +..include:: /includes/example-clone-collection.rst \ No newline at end of file From 86605c62204ae85739d021ba4f1741393e4157a5 Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Tue, 12 Apr 2016 10:12:19 -0700 Subject: [PATCH 2/6] fixed typo in .. include:: directive --- source/reference/command/cloneCollection.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reference/command/cloneCollection.txt b/source/reference/command/cloneCollection.txt index 18356afa070..82e5304f135 100644 --- a/source/reference/command/cloneCollection.txt +++ b/source/reference/command/cloneCollection.txt @@ -40,4 +40,4 @@ Behavior Example ------- -..include:: /includes/example-clone-collection.rst \ No newline at end of file +.. include:: /includes/example-clone-collection.rst From 7c799921dc631c9829dc6407aa09e188844e973f Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Tue, 12 Apr 2016 13:37:09 -0700 Subject: [PATCH 3/6] DOCS-7476: cannot use cloneCollection if source server has auth enabled --- source/includes/extracts-cloneCollection.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/includes/extracts-cloneCollection.yaml b/source/includes/extracts-cloneCollection.yaml index a50abaa6adc..c9e9fc1519d 100644 --- a/source/includes/extracts-cloneCollection.yaml +++ b/source/includes/extracts-cloneCollection.yaml @@ -2,6 +2,9 @@ ref: _cloneCollection-behavior content: | :program:`mongos` does not support {{cloneCollection}}. + :dbcommand:`cloneCollection` cannot be used if the `from` server has + :doc:`authorization ` enabled. + .. versionchanged:: 3.0 If the given :term:`namespace` already exists in the destination From a4c7171384bb1536eecac1dcbbc1d3b4f635c93d Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Thu, 21 Apr 2016 14:45:38 -0700 Subject: [PATCH 4/6] fixed {{cloneCollection}} reference --- source/includes/extracts-cloneCollection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/includes/extracts-cloneCollection.yaml b/source/includes/extracts-cloneCollection.yaml index c9e9fc1519d..99753665fdb 100644 --- a/source/includes/extracts-cloneCollection.yaml +++ b/source/includes/extracts-cloneCollection.yaml @@ -2,7 +2,7 @@ ref: _cloneCollection-behavior content: | :program:`mongos` does not support {{cloneCollection}}. - :dbcommand:`cloneCollection` cannot be used if the `from` server has + {{cloneCollection}} cannot be used if the `from` server has :doc:`authorization ` enabled. .. versionchanged:: 3.0 From c8eb3ad720688b94de39d5dde84c8feb6b09688c Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Fri, 22 Apr 2016 10:27:07 -0700 Subject: [PATCH 5/6] added db.runCommand() to example --- source/includes/example-clone-collection.rst | 7 ++++--- source/reference/method/db.cloneCollection.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/includes/example-clone-collection.rst b/source/includes/example-clone-collection.rst index 9b40dfb7050..dfb7c8a2d03 100644 --- a/source/includes/example-clone-collection.rst +++ b/source/includes/example-clone-collection.rst @@ -1,8 +1,9 @@ .. code-block:: javascript - { cloneCollection: "users.profiles", - from: "mongodb.example.net:27017", - query: { active: true } } + db.runCommand( { cloneCollection: "users.profiles", + from: "mongodb.example.net:27017", + query: { active: true } + } ) This operation copies the ``profiles`` collection from the ``users`` database on the server at ``mongodb.example.net``. The operation only diff --git a/source/reference/method/db.cloneCollection.txt b/source/reference/method/db.cloneCollection.txt index d1413a47624..fabf781861a 100644 --- a/source/reference/method/db.cloneCollection.txt +++ b/source/reference/method/db.cloneCollection.txt @@ -30,4 +30,4 @@ Behavior Example ------- -..include:: /includes/example-clone-collection.rst \ No newline at end of file +.. include:: /includes/example-clone-collection.rst \ No newline at end of file From bda5f9a481bc8adc8b9d4dd69a62f32b03e55e3c Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Fri, 22 Apr 2016 11:31:00 -0700 Subject: [PATCH 6/6] DOCS-7476: replaced example with one that actually uses the method that the page is about --- source/includes/example-clone-collection-text.rst | 3 +++ source/includes/example-clone-collection.rst | 6 ++---- source/reference/method/db.cloneCollection.txt | 7 ++++++- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 source/includes/example-clone-collection-text.rst diff --git a/source/includes/example-clone-collection-text.rst b/source/includes/example-clone-collection-text.rst new file mode 100644 index 00000000000..4ce0f05e3bb --- /dev/null +++ b/source/includes/example-clone-collection-text.rst @@ -0,0 +1,3 @@ +This operation copies the ``profiles`` collection from the ``users`` +database on the server at ``mongodb.example.net``. The operation only +copies documents that satisfy the query ``{ 'active' : true }``. \ No newline at end of file diff --git a/source/includes/example-clone-collection.rst b/source/includes/example-clone-collection.rst index dfb7c8a2d03..595928bbb08 100644 --- a/source/includes/example-clone-collection.rst +++ b/source/includes/example-clone-collection.rst @@ -2,9 +2,7 @@ db.runCommand( { cloneCollection: "users.profiles", from: "mongodb.example.net:27017", - query: { active: true } + query: { 'active' : true } } ) -This operation copies the ``profiles`` collection from the ``users`` -database on the server at ``mongodb.example.net``. The operation only -copies documents that satisfy the query ``{ active: true }``. +.. include:: /includes/example-clone-collection-text.rst \ No newline at end of file diff --git a/source/reference/method/db.cloneCollection.txt b/source/reference/method/db.cloneCollection.txt index fabf781861a..e7715a1c45e 100644 --- a/source/reference/method/db.cloneCollection.txt +++ b/source/reference/method/db.cloneCollection.txt @@ -30,4 +30,9 @@ Behavior Example ------- -.. include:: /includes/example-clone-collection.rst \ No newline at end of file +.. code-block:: javascript + + db.cloneCollection('mongodb.example.net:27017', 'users.profile', + { 'active' : true } ) + +.. include:: /includes/example-clone-collection-text.rst