NODE-477 Ensure insertOne/insertMany/updateOne/updateMay/replaceOne/deleteOne/deleteMany return {ok:1} on 2.4 or earlier servers that do not support write commands

Author: christkv

lib/collection.js

@@ -345,6 +345,9 @@ Collection.prototype.insertOne = function(doc, options, callback) {
   insertDocuments(this, [doc], options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    // Workaround for pre 2.6 servers
+    if(r == null) return callback(null, {result: {ok:1}});
+    // Add values to top level to ensure crud spec compatibility
     r.insertedCount = r.result.n;
     r.insertedId = doc._id;
     if(callback) callback(null, r);
@@ -370,6 +373,7 @@ Collection.prototype.insertMany = function(docs, options, callback) {
   insertDocuments(this, docs, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    if(r == null) return callback(null, {result: {ok:1}});
     r.insertedCount = r.result.n;
     var ids = [];
     for(var i = 0; i < docs.length; i++) {
@@ -557,6 +561,7 @@ Collection.prototype.updateOne = function(filter, update, options, callback) {
   updateDocuments(this, filter, update, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    if(r == null) return callback(null, {result: {ok:1}});
     r.matchedCount = r.result.n;
     r.modifiedCount = r.result.nModified != null ? r.result.nModified : r.result.n;
     r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
@@ -587,6 +592,7 @@ Collection.prototype.replaceOne = function(filter, update, options, callback) {
   updateDocuments(this, filter, update, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    if(r == null) return callback(null, {result: {ok:1}});
     r.matchedCount = r.result.n;
     r.modifiedCount = r.result.nModified != null ? r.result.nModified : r.result.n;
     r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
@@ -618,6 +624,7 @@ Collection.prototype.updateMany = function(filter, update, options, callback) {
   updateDocuments(this, filter, update, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    if(r == null) return callback(null, {result: {ok:1}});
     r.matchedCount = r.result.n;
     r.modifiedCount = r.result.nModified != null ? r.result.nModified : r.result.n;
     r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
@@ -698,6 +705,7 @@ Collection.prototype.deleteOne = function(filter, options, callback) {
   removeDocuments(this, filter, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    if(r == null) return callback(null, {result: {ok:1}});
     r.deletedCount = r.result.n;
     if(callback) callback(null, r);
   });
@@ -723,6 +731,7 @@ Collection.prototype.deleteMany = function(filter, options, callback) {
   removeDocuments(this, filter, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
+    if(r == null) return callback(null, {result: {ok:1}});
     r.deletedCount = r.result.n;
     if(callback) callback(null, r);
   });

test/functional/crud_api_tests.js

@@ -800,7 +800,7 @@ exports['should correctly execute removeMany with no selector'] = {
   }
 }
 
-exports['should correctly execute insertOne with w:0'] = {
+exports['should correctly execute crud operations with w:0'] = {
   // Add a tag that our runner can trigger on
   // in this case we are setting that node needs to be higher than 0.10.X to run
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
@@ -818,8 +818,33 @@ exports['should correctly execute insertOne with w:0'] = {
         test.equal(null, err);
         test.equal(1, result.result.ok);
 
-        db.close();
-        test.done();
+        col.insertMany([{a:1}], {w:0}, function(err,result) {
+          test.equal(null, err);
+          test.equal(1, result.result.ok);
+
+          col.updateOne({a:1}, {$set: {b:1}}, {w:0}, function(err,result) {
+            test.equal(null, err);
+            test.equal(1, result.result.ok);
+
+            col.updateMany({a:1}, {$set: {b:1}}, {w:0}, function(err,result) {
+              test.equal(null, err);
+              test.equal(1, result.result.ok);
+
+              col.deleteOne({a:1}, {w:0}, function(err,result) {
+                test.equal(null, err);
+                test.equal(1, result.result.ok);
+
+                col.deleteMany({a:1}, {w:0}, function(err,result) {
+                  test.equal(null, err);
+                  test.equal(1, result.result.ok);
+
+                  db.close();
+                  test.done();
+                });
+              });
+            });
+          });
+        });
       });
     });
   }