NODE-549 findAndModify take a write concern

Author: christkv

lib/collection.js

@@ -1981,14 +1981,16 @@ Collection.prototype.findOneAndDelete = function(filter, options, callback) {
 }
 
 var findOneAndDelete = function(self, filter, options, callback) {
+  // Final options
+  var finalOptions = shallowClone(options);
+  finalOptions['fields'] = options.projection;
+  finalOptions['remove'] = true;
+  // Execute find and Modify
   self.findAndModify(
       filter
     , options.sort
     , null
-    , {
-        fields: options.projection
-      , remove:true
-    }
+    , finalOptions
     , callback
   );
 }
@@ -2030,16 +2032,19 @@ Collection.prototype.findOneAndReplace = function(filter, replacement, options,
 }
 
 var findOneAndReplace = function(self, filter, replacement, options, callback) {
+  // Final options
+  var finalOptions = shallowClone(options);
+  finalOptions['fields'] = options.projection;
+  finalOptions['update'] = true;
+  finalOptions['new'] = typeof options.returnOriginal == 'boolean' ? !options.returnOriginal : false;
+  finalOptions['upsert'] = typeof options.upsert == 'boolean' ? options.upsert : false;
+
+  // Execute findAndModify
   self.findAndModify(
       filter
     , options.sort
     , replacement
-    , {
-        fields: options.projection
-      , update: true
-      , new: typeof options.returnOriginal == 'boolean' ? !options.returnOriginal : false
-      , upsert: typeof options.upsert == 'boolean' ? options.upsert : false
-    }
+    , finalOptions
     , callback
   );
 }
@@ -2081,16 +2086,19 @@ Collection.prototype.findOneAndUpdate = function(filter, update, options, callba
 }
 
 var findOneAndUpdate = function(self, filter, update, options, callback) {
+  // Final options
+  var finalOptions = shallowClone(options);
+  finalOptions['fields'] = options.projection;
+  finalOptions['update'] = true;
+  finalOptions['new'] = typeof options.returnOriginal == 'boolean' ? !options.returnOriginal : false;
+  finalOptions['upsert'] = typeof options.upsert == 'boolean' ? options.upsert : false;
+
+  // Execute findAndModify
   self.findAndModify(
       filter
     , options.sort
     , update
-    , {
-        fields: options.projection
-      , update: true
-      , new: typeof options.returnOriginal == 'boolean' ? !options.returnOriginal : false
-      , upsert: typeof options.upsert == 'boolean' ? options.upsert : false
-    }
+    , finalOptions
     , callback
   );
 }
@@ -2178,6 +2186,14 @@ var findAndModify = function(self, query, sort, doc, options, callback) {
   // No check on the documents
   options.checkKeys = false;
 
+  // Get the write concern settings
+  var finalOptions = writeConcern(options, self.s.db, self, options);
+
+  // Decorate the findAndModify command with the write Concern
+  if(finalOptions.writeConcern) {
+    queryObject.writeConcern = finalOptions.writeConcern;
+  }
+
   // Execute the command
   self.s.db.command(queryObject
     , options, function(err, result) {

test/functional/find_tests.js

@@ -2301,3 +2301,32 @@ exports['Should simulate closed cursor'] = {
     });
   }
 }
+
+/**
+ * Find and modify should allow for a write Concern without failing
+ * @ignore
+ */
+exports['should correctly execute a findAndModifyWithAWriteConcern'] = {
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
+    db.open(function(err, db) {
+      db.createCollection('test_find_and_modify_a_document', function(err, collection) {
+        // Test return new document on change
+        collection.insert({'a':1, 'b':2}, configuration.writeConcernMax(), function(err, doc) {
+          // Let's modify the document in place
+          collection.findAndModify({'a':1}
+            , [['a', 1]], {'$set':{'b':3}}, {'new':true, j:1}, function(err, updated_doc) {
+              test.equal(1, updated_doc.value.a);
+              test.equal(3, updated_doc.value.b);
+
+              db.close();
+              test.done();
+          })
+        });
+      });
+    });
+  }
+}

test/runner.js

@@ -261,6 +261,7 @@ var testFiles =[
   , '/test/functional/operation_example_tests.js'
   , '/test/functional/crud_api_tests.js'
   , '/test/functional/reconnect_tests.js'
+  , '/test/functional/find_and_modify_tests.js'
 
   // Logging tests
   , '/test/functional/logger_tests.js'