Merge pull request #1489 from mbroadst/bulk-inserted-ids-fix

fix(UnorderedBulkOperation): push correct index for INSERT ops

Author: christkv

lib/bulk/unordered.js

@@ -148,7 +148,7 @@ FindOperatorsUnordered.prototype.remove = function() {
 var addToOperationsList = function(_self, docType, document) {
   // Get the bsonSize
   var bsonSize = bson.calculateObjectSize(document, {
-		checkKeys: false,		
+		checkKeys: false,
 	});
   // Throw error if the doc is bigger than the max BSON size
   if(bsonSize >= _self.s.maxBatchSizeBytes) throw toError("document is larger than the maximum size " + _self.s.maxBatchSizeBytes);
@@ -178,18 +178,20 @@ var addToOperationsList = function(_self, docType, document) {
   }
 
   // We have an array of documents
+  var insertIndex;
   if(Array.isArray(document)) {
     throw toError("operation passed in cannot be an Array");
   } else {
     _self.s.currentBatch.operations.push(document);
     _self.s.currentBatch.originalIndexes.push(_self.s.currentIndex);
+    insertIndex = _self.s.currentIndex;
     _self.s.currentIndex = _self.s.currentIndex + 1;
   }
 
   // Save back the current Batch to the right type
   if(docType == common.INSERT) {
     _self.s.currentInsertBatch = _self.s.currentBatch;
-    _self.s.bulkResult.insertedIds.push({index: _self.s.currentIndex, _id: document._id});
+    _self.s.bulkResult.insertedIds.push({index: insertIndex, _id: document._id});
   } else if(docType == common.UPDATE) {
     _self.s.currentUpdateBatch = _self.s.currentBatch;
   } else if(docType == common.REMOVE) {

test/functional/insert_tests.js

@@ -2219,6 +2219,40 @@ exports['Correctly allow forceServerObjectId for insertMany'] = {
   }
 }
 
+exports['should return correct number of ids for insertMany { ordered: true }'] = {
+  metadata: { requires: { topology: [ 'single' ] } },
+  test: function(configuration, test) {
+    var db = configuration.newDbInstance({ w: 1 }, { poolSize: 1, auto_reconnect: false });
+    db.open(function(err, db) {
+      test.equal(null, err);
+      db.collection('inserted_ids_test').insertMany([{}, {}, {}], { ordered: true })
+        .then(function(r) {
+          test.equal(null, err);
+          test.equal(3, r.insertedIds.length);
+          db.close();
+          test.done();
+        });
+    });
+  }
+}
+
+exports['should return correct number of ids for insertMany { ordered: false }'] = {
+  metadata: { requires: { topology: [ 'single' ] } },
+  test: function(configuration, test) {
+    var db = configuration.newDbInstance({ w: 1 }, { poolSize:1, auto_reconnect:false });
+    db.open(function(err, db) {
+      test.equal(null, err);
+      db.collection('inserted_ids_test').insertMany([{}, {}, {}], { ordered: false })
+        .then(function(r) {
+          test.equal(null, err);
+          test.equal(3, r.insertedIds.length);
+          db.close();
+          test.done();
+        });
+    });
+  }
+}
+
 exports['Insert document including sub documents'] = {
   metadata: { requires: { topology: ['single'] } },