Allow user to specify custom _id. Closes #29

scottwrobinson · Jan 19, 2016 · 767d163 · 767d163
1 parent da35432
commit 767d163
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/lib/clients/mongoclient.js b/lib/clients/mongoclient.js
@@ -34,7 +34,7 @@ class MongoClient extends DatabaseClient {
                     return resolve(result.insertedId);
                 });
             } else {
-                db.updateOne({ _id: id }, { $set: values }, function(error, result) {
+                db.updateOne({ _id: id }, { $set: values }, { upsert: true }, function(error, result) {
                     if (error) return reject(error);
                     return resolve();
                 });

diff --git a/lib/clients/nedbclient.js b/lib/clients/nedbclient.js
@@ -64,7 +64,7 @@ class NeDbClient extends DatabaseClient {
 					return resolve(result._id);
 			    });
 			} else {
-				db.update({ _id: id }, { $set: values }, function(error, result) {
+				db.update({ _id: id }, { $set: values }, { upsert: true }, function(error, result) {
 					if (error) return reject(error);
 					return resolve(result);
 			    });

diff --git a/test/mongoclient.test.js b/test/mongoclient.test.js
@@ -2,6 +2,7 @@
 
 var _ = require('lodash');
 var expect = require('chai').expect;
+var ObjectId = require('mongodb').ObjectId;
 var connect = require('../index').connect;
 var Document = require('../index').Document;
 var validateId = require('./util').validateId;
@@ -30,7 +31,32 @@ describe('MongoClient', function() {
 
     after(function(done) {
         done();
-    }); 
+    });
+
+    describe('id', function() {
+        it('should allow custom _id values', function(done) {
+            class School extends Document {
+                constructor() {
+                    super();
+
+                    this.name = String;
+                }
+            }
+
+            var school = School.create();
+            school._id = new ObjectId('1234567890abcdef12345678');
+            school.name = 'Springfield Elementary';
+
+            school.save().then(function() {
+                validateId(school);
+                expect(school._id.toString()).to.be.equal('1234567890abcdef12345678');
+                return School.loadOne();
+            }).then(function(s) {
+                validateId(s);
+                expect(s._id.toString()).to.be.equal('1234567890abcdef12345678');
+            }).then(done, done);
+        });
+    });
 
     describe('query', function() {
         class User extends Document {

diff --git a/test/nedbclient.test.js b/test/nedbclient.test.js
@@ -91,6 +91,31 @@ describe('NeDbClient', function() {
         });
     });*/
 
+    describe('id', function() {
+        it('should allow custom _id values', function(done) {
+            class School extends Document {
+                constructor() {
+                    super();
+
+                    this.name = String;
+                }
+            }
+
+            var school = School.create();
+            school._id = '1234567890abcdef';
+            school.name = 'South Park Elementary';
+
+            school.save().then(function() {
+                validateId(school);
+                expect(school._id).to.be.equal('1234567890abcdef');
+                return School.loadOne();
+            }).then(function(s) {
+                validateId(s);
+                expect(s._id).to.be.equal('1234567890abcdef');
+            }).then(done, done);
+        });
+    });
+
     describe('indexes', function() {
         it('should reject documents with duplicate values in unique-indexed fields', function(done) {
             class User extends Document {