Merge pull request #982 from strongloop/fix/auto-increment-db

forceId=true with auto-increment db

Author: Janny

lib/datasource.js

@@ -515,7 +515,11 @@ DataSource.prototype.setupDataAccess = function(modelClass, settings) {
       idProp.type = idType;
       modelClass.definition.rawProperties[idName].type = idType;
       modelClass.definition.properties[idName].type = idType;
-      if (settings.forceId) {
+      var forceId = settings.forceId;
+      if (idProp.generated && forceId !== false) {
+        forceId = true;
+      }
+      if (forceId) {
         modelClass.validatesAbsenceOf(idName, { if: 'isNewRecord' });
       }
     }

test/crud-with-options.test.js

@@ -13,6 +13,7 @@ describe('crud-with-options', function() {
   before(function(done) {
     db = getSchema();
     User = db.define('User', {
+      id: { type: Number, id: true },
       seq: { type: Number, index: true },
       name: { type: String, index: true, sort: true },
       email: { type: String, index: true },

test/default-scope.test.js

@@ -94,6 +94,7 @@ describe('default scope', function() {
 
     Person = db.define('Person', { name: String }, {
       scope: { include: 'things' },
+      forceId: false,
     });
 
     // inst is only valid for instance methods

test/loopback-dl.test.js

@@ -766,7 +766,7 @@ describe('Models attached to a dataSource', function() {
       title: { type: String, length: 255, index: true },
       content: { type: String },
       comments: [String],
-    });
+    }, { forceId: false });
   });
 
   beforeEach(function(done) {

test/manipulation.test.js

@@ -61,6 +61,21 @@ describe('manipulation', function() {
       Person.destroyAll(done);
     });
 
+    describe('forceId', function() {
+      before(function(done) {
+        TestForceId = db.define('TestForceId');
+        db.automigrate('TestForceId', done);
+      });
+
+      it('it defaults to forceId:true for generated id property', function(done) {
+        TestForceId.create({ id: 1 }, function(err, t) {
+          should.exist(err);
+          err.message.should.match(/can\'t be set/);
+          done();
+        });
+      });
+    });
+
     it('should create instance', function(done) {
       Person.create({ name: 'Anatoliy' }, function(err, p) {
         p.name.should.equal('Anatoliy');
@@ -308,7 +323,7 @@ describe('manipulation', function() {
     it('should refuse to create object with duplicate id', function(done) {
       // NOTE(bajtos) We cannot reuse Person model here,
       // `settings.forceId` aborts the CREATE request at the validation step.
-      var Product = db.define('ProductTest', { name: String });
+      var Product = db.define('ProductTest', { name: String }, { forceId: false });
       db.automigrate('ProductTest', function(err) {
         if (err) return done(err);
 
@@ -825,7 +840,7 @@ describe('manipulation', function() {
           title: { type: String, length: 255, index: true },
           content: { type: String },
           comments: [String],
-        });
+        }, { forceId: false });
         ds.automigrate('Post', done);
       });
 
@@ -1046,6 +1061,8 @@ describe('manipulation', function() {
         ds.automigrate('Post', done);
       });
       beforeEach(function(done) {
+        // TODO(bajtos) add API to lib/observer - remove observers for all hooks
+        Post._observers = {};
         Post.destroyAll(function() {
           Post.create({ title: 'a', content: 'AAA' }, function(err, p) {
             if (err) return done(err);

test/relations.test.js

@@ -4190,7 +4190,7 @@ describe('relations', function() {
       tmp = getTransientDataSource();
       // db = getSchema();
       Person = db.define('Person', { name: String });
-      Address = tmp.define('Address', { street: String });
+      Address = tmp.define('Address', { street: String }, { forceId: false });
       Address.validatesPresenceOf('street');
 
       db.automigrate(['Person'], done);
@@ -4488,7 +4488,7 @@ describe('relations', function() {
       // db = getSchema();
       Category = db.define('Category', { name: String });
       Job = db.define('Job', { name: String });
-      Link = db.define('Link', { name: String, notes: String });
+      Link = db.define('Link', { name: String, notes: String }, { forceId: false });
     });
 
     it('can be declared', function(done) {
@@ -4509,10 +4509,13 @@ describe('relations', function() {
 
     it('should setup related items', function(done) {
       Job.create({ name: 'Job 1' }, function(err, p) {
+        if (err) return done(err);
         job1 = p;
         Job.create({ name: 'Job 2' }, function(err, p) {
+          if (err) return done(err);
           job2 = p;
           Job.create({ name: 'Job 3' }, function(err, p) {
+            if (err) return done(err);
             job3 = p;
             done();
           });
@@ -4522,11 +4525,13 @@ describe('relations', function() {
 
     it('should associate items on scope', function(done) {
       Category.create({ name: 'Category A' }, function(err, cat) {
+        if (err) return done(err);
         var link = cat.items.build();
         link.job(job1);
         var link = cat.items.build();
         link.job(job2);
         cat.save(function(err, cat) {
+          if (err) return done(err);
           var job = cat.items.at(0);
           job.should.be.instanceof(Link);
           job.should.not.have.property('jobId');
@@ -4542,6 +4547,7 @@ describe('relations', function() {
 
     it('should include related items on scope', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(2);
 
         // denormalized properties:
@@ -4556,6 +4562,7 @@ describe('relations', function() {
         should.not.exist(cat.items.at(1).job());
 
         cat.items(function(err, items) {
+          if (err) return done(err);
           cat.items.at(0).job().should.be.instanceof(Job);
           cat.items.at(1).job().should.be.instanceof(Job);
           cat.items.at(1).job().name.should.equal('Job 2');
@@ -4566,8 +4573,10 @@ describe('relations', function() {
 
     it('should remove embedded items by id', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(2);
         cat.items.destroy(job1.id, function(err) {
+          if (err) return done(err);
           should.not.exist(err);
           cat.links.should.have.length(1);
           done();
@@ -4577,6 +4586,7 @@ describe('relations', function() {
 
     it('should find items on scope', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(1);
         cat.items.at(0).id.should.eql(job2.id);
         cat.items.at(0).name.should.equal(job2.name);
@@ -4585,6 +4595,7 @@ describe('relations', function() {
         should.not.exist(cat.items.at(0).job());
 
         cat.items(function(err, items) {
+          if (err) return done(err);
           cat.items.at(0).job().should.be.instanceof(Job);
           cat.items.at(0).job().name.should.equal('Job 2');
           done();
@@ -4594,8 +4605,10 @@ describe('relations', function() {
 
     it('should add related items to scope', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(1);
         cat.items.add(job3, function(err, link) {
+          if (err) return done(err);
           link.should.be.instanceof(Link);
           link.id.should.eql(job3.id);
           link.name.should.equal('Job 3');
@@ -4608,6 +4621,7 @@ describe('relations', function() {
 
     it('should find items on scope', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(2);
 
         cat.items.at(0).should.be.instanceof(Link);
@@ -4622,8 +4636,10 @@ describe('relations', function() {
 
     it('should remove embedded items by reference id', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(2);
         cat.items.remove(job2.id, function(err) {
+          if (err) return done(err);
           should.not.exist(err);
           cat.links.should.have.length(1);
           done();
@@ -4633,6 +4649,7 @@ describe('relations', function() {
 
     it('should have removed embedded items by reference id', function(done) {
       Category.findOne(function(err, cat) {
+        if (err) return done(err);
         cat.links.should.have.length(1);
         done();
       });
@@ -4642,9 +4659,11 @@ describe('relations', function() {
 
     it('should create items on scope', function(done) {
       Category.create({ name: 'Category B' }, function(err, cat) {
+        if (err) return done(err);
         category = cat;
         var link = cat.items.build({ notes: 'Some notes...' });
         link.job.create({ name: 'Job 1' }, function(err, p) {
+          if (err) return done(err);
           jobId = p.id;
           cat.links[0].id.should.eql(p.id);
           cat.links[0].name.should.equal('Job 1'); // denormalized
@@ -4657,12 +4676,14 @@ describe('relations', function() {
 
     it('should find items on scope', function(done) {
       Category.findById(category.id, function(err, cat) {
+        if (err) return done(err);
         cat.name.should.equal('Category B');
         cat.links.toObject().should.eql([
           { id: jobId, name: 'Job 1', notes: 'Some notes...' },
         ]);
         cat.items.at(0).should.equal(cat.links[0]);
         cat.items(function(err, items) { // alternative access
+          if (err) return done(err);
           items.should.be.an.array;
           items.should.have.length(1);
           items[0].job(function(err, p) {
@@ -4675,8 +4696,10 @@ describe('relations', function() {
 
     it('should update items on scope - and save parent', function(done) {
       Category.findById(category.id, function(err, cat) {
+        if (err) return done(err);
         var link = cat.items.at(0);
         link.updateAttributes({ notes: 'Updated notes...' }, function(err, link) {
+          if (err) return done(err);
           link.notes.should.equal('Updated notes...');
           done();
         });
@@ -4685,6 +4708,7 @@ describe('relations', function() {
 
     it('should find items on scope - verify update', function(done) {
       Category.findById(category.id, function(err, cat) {
+        if (err) return done(err);
         cat.name.should.equal('Category B');
         cat.links.toObject().should.eql([
           { id: jobId, name: 'Job 1', notes: 'Updated notes...' },
@@ -4695,7 +4719,9 @@ describe('relations', function() {
 
     it('should remove items from scope - and save parent', function(done) {
       Category.findById(category.id, function(err, cat) {
+        if (err) return done(err);
         cat.items.at(0).destroy(function(err, link) {
+          if (err) return done(err);
           cat.links.should.eql([]);
           done();
         });
@@ -4704,6 +4730,7 @@ describe('relations', function() {
 
     it('should find items on scope - verify destroy', function(done) {
       Category.findById(category.id, function(err, cat) {
+        if (err) return done(err);
         cat.name.should.equal('Category B');
         cat.links.should.eql([]);
         done();