Fix forceId to reject empty strings

lib/model-builder.js

@@ -351,7 +351,7 @@ ModelBuilder.prototype.define = function defineClass(className, properties, sett
     }
 
     if (forceId) {
-      ModelClass.validatesAbsenceOf(idName, {if: 'isNewRecord'});
+      ModelClass.validatesAbsenceOf(idName, {if: 'isNewRecord', allowBlank: false, allowNull: false});
     }
 
     ModelClass.definition.properties[idName].updateOnly = !!forceId;

lib/validations.js

@@ -71,6 +71,8 @@ Validatable.validatesPresenceOf = getConfigurator('presence');
  * @property {String} message Error message to use instead of default.
  * @property {String} if Validate only if `if` exists.
  * @property {String} unless Validate only if `unless` exists.
+ * @property {Boolean} allowBlank Allow property to be blank.
+ * @property {Boolean} allowNull Allow property to be null.
  */
 Validatable.validatesAbsenceOf = getConfigurator('absence');
 
@@ -296,6 +298,8 @@ function validatePresence(attr, conf, err, options) {
  * Absence validator
  */
 function validateAbsence(attr, conf, err, options) {
+  if (nullCheck.call(this, attr, Object.assign({allowBlank: true, allowNull: true}, conf), err)) return;
+
   if (!blank(this[attr])) {
     err();
   }

test/optional-validation.test.js

@@ -136,6 +136,21 @@ describe('optional-validation', function() {
         });
       });
     });
+    context('create', function() {
+      it('should fail with a null id', function(done) {
+        ModelWithForceId.create({id: null}, function(err, created) {
+          should.exist(err);
+          done();
+        });
+      });
+
+      it('should fail with an empty id', function(done) {
+        ModelWithForceId.create({id: ''}, function(err, created) {
+          should.exist(err);
+          done();
+        });
+      });
+    });
   });
 
   describe('no model setting', function() {

test/validations.test.js

@@ -513,6 +513,30 @@ describe('validations', function() {
       u.isValid().should.be.true();
     });
 
+    it('should validate absence with allowBlank set to true', function() {
+      User.validatesAbsenceOf('foo', {allowBlank: true});
+      var u = new User({foo: ''});
+      u.isValid().should.be.true();
+    });
+
+    it('should validate absence with allowBlank set to false', function() {
+      User.validatesAbsenceOf('foo', {allowBlank: false});
+      var u = new User({foo: ''});
+      u.isValid().should.be.false();
+    });
+
+    it('should validate absence with allowNull set to true', function() {
+      User.validatesAbsenceOf('foo', {allowNull: true});
+      var u = new User({foo: null});
+      u.isValid().should.be.true();
+    });
+
+    it('should validate absence with allowNull set to true', function() {
+      User.validatesAbsenceOf('foo', {allowNull: false});
+      var u = new User({foo: null});
+      u.isValid().should.be.false();
+    });
+
     describe('validate absence on update', function() {
       before(function(done) {
         Employee.destroyAll(function(err) {