fixed; required validation for populated refs

closes #577
Automattic · Nov 2, 2011 · b99d4ac · b99d4ac
1 parent f5dd3ae
commit b99d4ac
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/lib/schema/number.js b/lib/schema/number.js
@@ -31,8 +31,12 @@ SchemaNumber.prototype.__proto__ = SchemaType.prototype;
  * @api private
  */
 
-SchemaNumber.prototype.checkRequired = function (value) {
-  return typeof value == 'number' || value instanceof Number;
+SchemaNumber.prototype.checkRequired = function checkRequired (value) {
+  if (SchemaType._isRef(this, value, true)) {
+    return null !== value;
+  } else {
+    return typeof value == 'number' || value instanceof Number;
+  }
 };
 
 /**

diff --git a/lib/schema/objectid.js b/lib/schema/objectid.js
@@ -32,8 +32,12 @@ ObjectId.prototype.__proto__ = SchemaType.prototype;
  * @api private
  */
 
-ObjectId.prototype.checkRequired = function (value) {
-  return !!value && value instanceof oid;
+ObjectId.prototype.checkRequired = function checkRequired (value) {
+  if (SchemaType._isRef(this, value, true)) {
+    return null !== value;
+  } else {
+    return value instanceof oid;
+  }
 };
 
 /**

diff --git a/lib/schema/string.js b/lib/schema/string.js
@@ -115,8 +115,12 @@ SchemaString.prototype.match = function(regExp){
  * @api private
  */
 
-SchemaString.prototype.checkRequired = function (v) {
-  return (v instanceof String || typeof v == 'string') && v.length;
+SchemaString.prototype.checkRequired = function checkRequired (value) {
+  if (SchemaType._isRef(this, value, true)) {
+    return null !== value;
+  } else {
+    return (value instanceof String || typeof value == 'string') && value.length;
+  }
 };
 
 /**