{'forceServerObjectId':true} option added to db to force server to as…

…sign objectid's instead of the client
christkv · Jun 1, 2011 · 0f50277 · 0f50277
1 parent 74d4b52
commit 0f50277
Show file tree

Hide file tree

Showing 3 changed files with 456 additions and 408 deletions.
diff --git a/lib/mongodb/collection.js b/lib/mongodb/collection.js
@@ -260,7 +260,7 @@ Collection.prototype.insertAll = function insertAll (docs, options, callback) {
     var doc = docs[index];
 
     // Add id to each document if it's not already defined
-    if (!doc['_id']) {
+    if (!doc['_id'] && this.db.forceServerObjectId != true) {
       doc['_id'] = this.pkFactory.createPk();
     }
 

diff --git a/lib/mongodb/db.js b/lib/mongodb/db.js
@@ -31,10 +31,13 @@ var Db = exports.Db = function(databaseName, serverConfig, options) {
     // If we tried to instantiate the native driver
     throw "Native bson parser not compiled, please compile or avoid using native_parser=true";
   }
+  debug(inspect(options))
+
   // this.connections = [];
   // State of the db connection
   this.state = 'notConnected';
   this.pkFactory = this.options.pk == null ? this.bson_serializer.ObjectID : this.options.pk;  
+  this.forceServerObjectId = this.options.forceServerObjectId != null ? this.options.forceServerObjectId : false;
   // Added strict
   this.strict = this.options.strict == null ? false : this.options.strict;
   this.notReplied ={};