NODE-899 reversed updateOne upsertedId change

Author: christkv

lib/collection.js

@@ -893,15 +893,9 @@ var updateOne = function(self, filter, update, options, callback) {
     if(err && callback) return callback(err);
     if(r == null) return callback(null, {result: {ok:1}});
     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]._id : null;
+    r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
     r.upsertedCount = Array.isArray(r.result.upserted) && r.result.upserted.length ? r.result.upserted.length : 0;
     r.matchedCount = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? 0 : r.result.n;
-
-    // Fix for NODE-899, backward compatibility with legacy format
-    if(r.upsertedId) {
-      r.upsertedId._id = new ObjectID(r.upsertedId.id);
-    }
-
     if(callback) callback(null, r);
   });
 }
@@ -954,8 +948,9 @@ var replaceOne = function(self, filter, doc, options, callback) {
     if(callback == null) return;
     if(err && callback) return callback(err);
     if(r == null) return callback(null, {result: {ok:1}});
+
     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]._id : null;
+    r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
     r.upsertedCount = Array.isArray(r.result.upserted) && r.result.upserted.length ? r.result.upserted.length : 0;
     r.matchedCount = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? 0 : r.result.n;
     r.ops = [doc];
@@ -1010,7 +1005,7 @@ var updateMany = function(self, filter, update, options, callback) {
     if(err && callback) return callback(err);
     if(r == null) return callback(null, {result: {ok:1}});
     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]._id : null;
+    r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
     r.upsertedCount = Array.isArray(r.result.upserted) && r.result.upserted.length ? r.result.upserted.length : 0;
     r.matchedCount = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? 0 : r.result.n;
     if(callback) callback(null, r);

test/functional/crud_api_tests.js

@@ -536,9 +536,6 @@ exports['should correctly execute update methods using crud api'] = {
             test.equal(1, r.result.n);
             test.equal(0, r.matchedCount);
             test.ok(r.upsertedId != null);
-            test.equal('ObjectID', r.upsertedId._bsontype);
-            test.equal('ObjectID', r.upsertedId._id._bsontype);
-            test.equal(r.upsertedId.toHexString(), r.upsertedId._id.toHexString());
 
             db.collection('t3_2').updateOne({ c: 1 }
               , { $set: { a: 1 } }, function(err, r) {

test/functional/crud_spec_tests.js

@@ -169,7 +169,11 @@ function executeScenario(scenario, configuration, db, test) {
 
             // Go over the results
             for (var name in scenarioTest.outcome.result) {
-              test.equal(scenarioTest.outcome.result[name], result[name]);
+              if(name == 'upsertedId') {
+                test.equal(scenarioTest.outcome.result[name], result[name]._id);
+              } else {
+                test.equal(scenarioTest.outcome.result[name], result[name]);
+              }
             }
 
             if (scenarioTest.outcome.collection) {
@@ -190,7 +194,11 @@ function executeScenario(scenario, configuration, db, test) {
 
             // Go over the results
             for (var name in scenarioTest.outcome.result) {
-              test.equal(scenarioTest.outcome.result[name], result[name]);
+              if(name == 'upsertedId') {
+                test.equal(scenarioTest.outcome.result[name], result[name]._id);
+              } else {
+                test.equal(scenarioTest.outcome.result[name], result[name]);
+              }
             }
 
             if (scenarioTest.outcome.collection) {