Merge branch 'd-mon--2.0' into 2.0t push origin 2.0

Author: christkv

lib/bulk/ordered.js

@@ -293,7 +293,7 @@ var define = OrderedBulkOperation.define = new Define('OrderedBulkOperation', Or
 
 OrderedBulkOperation.prototype.raw = function(op) {
   var key = Object.keys(op)[0];
-
+  var forceServerObjectId = this.s.collection.s.db.options.forceServerObjectId;
   // Update operations
   if((op.updateOne && op.updateOne.q)
     || (op.updateMany && op.updateMany.q)
@@ -325,16 +325,16 @@ OrderedBulkOperation.prototype.raw = function(op) {
 
   // Insert operations
   if(op.insertOne && op.insertOne.document == null) {
-    if(op.insertOne._id == null) op.insertOne._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne._id == null) op.insertOne._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne);
   } else if(op.insertOne && op.insertOne.document) {
-    if(op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne.document);
   }
 
   if(op.insertMany) {
     for(var i = 0; i < op.insertMany.length; i++) {
-      if(op.insertMany[i]._id == null) op.insertMany[i]._id = new ObjectID();
+      if(forceServerObjectId !== true && op.insertMany[i]._id == null) op.insertMany[i]._id = new ObjectID();
       addToOperationsList(this, common.INSERT, op.insertMany[i]);
     }
 
@@ -353,7 +353,7 @@ OrderedBulkOperation.prototype.raw = function(op) {
  * @return {OrderedBulkOperation}
  */
 OrderedBulkOperation.prototype.insert = function(document) {
-  if(document._id == null) document._id = new ObjectID();
+  if(this.s.collection.s.db.options.forceServerObjectId !== true && document._id == null) document._id = new ObjectID();
   return addToOperationsList(this, common.INSERT, document);
 }
 

lib/bulk/unordered.js

@@ -308,7 +308,7 @@ var define = UnorderedBulkOperation.define = new Define('UnorderedBulkOperation'
  * @return {UnorderedBulkOperation}
  */
 UnorderedBulkOperation.prototype.insert = function(document) {
-  if(document._id == null) document._id = new ObjectID();
+  if(this.s.collection.s.db.options.forceServerObjectId !== true && document._id == null) document._id = new ObjectID();
   return addToOperationsList(this, common.INSERT, document);
 }
 
@@ -342,7 +342,7 @@ Object.defineProperty(UnorderedBulkOperation.prototype, 'length', {
 
 UnorderedBulkOperation.prototype.raw = function(op) {
   var key = Object.keys(op)[0];
-
+  var forceServerObjectId = this.s.collection.s.db.options.forceServerObjectId;
   // Update operations
   if((op.updateOne && op.updateOne.q)
     || (op.updateMany && op.updateMany.q)
@@ -374,15 +374,16 @@ UnorderedBulkOperation.prototype.raw = function(op) {
 
   // Insert operations
   if(op.insertOne && op.insertOne.document == null) {
-    if(op.insertOne._id == null) op.insertOne._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne._id == null) op.insertOne._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne);
   } else if(op.insertOne && op.insertOne.document) {
-    if(op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne.document);
   }
 
   if(op.insertMany) {
     for(var i = 0; i < op.insertMany.length; i++) {
+      if(forceServerObjectId !== true && op.insertMany[i]._id == null) op.insertMany[i]._id = new ObjectID();
       addToOperationsList(this, common.INSERT, op.insertMany[i]);
     }
 

lib/collection.js

@@ -438,7 +438,7 @@ Collection.prototype.insertMany = function(docs, options, callback) {
   options['serializeFunctions'] = options['serializeFunctions'] || self.s.serializeFunctions;
 
   // Do we want to force the server to assign the _id key
-  if(options.forceServerObjectId == null || options.forceServerObjectId == false) {
+  if(self.s.db.options.forceServerObjectId!==true) {
     // Add _id if not specified
     for(var i = 0; i < docs.length; i++) {
       if(docs[i]._id == null) docs[i]._id = self.s.pkFactory.createPk();
@@ -618,8 +618,10 @@ var insertDocuments = function(self, docs, options, callback) {
   finalOptions['serializeFunctions'] = options['serializeFunctions'] || self.s.serializeFunctions;
 
   // Add _id if not specified
-  for(var i = 0; i < docs.length; i++) {
-    if(docs[i]._id == null) docs[i]._id = self.s.pkFactory.createPk();
+  if(self.s.db.options.forceServerObjectId!==true){
+    for(var i = 0; i < docs.length; i++) {
+      if(docs[i]._id == null) docs[i]._id = self.s.pkFactory.createPk();
+    }
   }
 
   // File inserts