SERVER-23791 extend shell helpers to pass collation parameter to server

Includes changes to the following:
 - Bulk API
 - CRUD API
 - DBCollection CRUD methods (e.g. DBCollection.prototype.remove())
 - New DBQuery.prototype.collation() method to use with find().

1 files changed, 36 insertions, 1 deletions

diff --git a/src/mongo/shell/bulk_api.js b/src/mongo/shell/bulk_api.js
index 84dc583b1ea..8ef10b5c976 100644
--- a/src/mongo/shell/bulk_api.js
+++ b/src/mongo/shell/bulk_api.js
@@ -674,6 +674,11 @@ var _bulk_api_module = (function() {
                     upsert: upsert
                 };
 
+                // Copy over the collation, if we have one.
+                if (currentOp.hasOwnProperty('collation')) {
+                    document.collation = currentOp.collation;
+                }
+
                 // Clear out current Op
                 currentOp = null;
                 // Add the update document to the list
@@ -693,6 +698,11 @@ var _bulk_api_module = (function() {
                     upsert: upsert
                 };
 
+                // Copy over the collation, if we have one.
+                if (currentOp.hasOwnProperty('collation')) {
+                    document.collation = currentOp.collation;
+                }
+
                 // Clear out current Op
                 currentOp = null;
                 // Add the update document to the list
@@ -718,6 +728,11 @@ var _bulk_api_module = (function() {
                     limit: 1
                 };
 
+                // Copy over the collation, if we have one.
+                if (currentOp.hasOwnProperty('collation')) {
+                    document.collation = currentOp.collation;
+                }
+
                 // Clear out current Op
                 currentOp = null;
                 // Add the remove document to the list
@@ -733,11 +748,31 @@ var _bulk_api_module = (function() {
                     limit: 0
                 };
 
+                // Copy over the collation, if we have one.
+                if (currentOp.hasOwnProperty('collation')) {
+                    document.collation = currentOp.collation;
+                }
+
                 // Clear out current Op
                 currentOp = null;
                 // Add the remove document to the list
                 return addToOperationsList(REMOVE, document);
-            }
+            },
+
+            collation: function(collationSpec) {
+                if (!collection.getMongo().hasWriteCommands()) {
+                    throw new Error(
+                        "cannot use collation if server does not support write commands");
+                }
+
+                if (collection.getMongo().writeMode() !== "commands") {
+                    throw new Error("write mode must be 'commands' in order to use collation, " +
+                                    "but found write mode: " + collection.getMongo().writeMode());
+                }
+
+                currentOp.collation = collationSpec;
+                return findOperations;
+            },
         };
 
         //