Merge pull request #2691 from sarme/master

Workaround to deal with an issue in node-webkit where the validate function fails on object literals

lib/utils/parameter-validator.js

@@ -8,7 +8,7 @@ var validateDeprecation = function(value, expectation, options) {
     return;
   }
 
-  var valid = value instanceof options.deprecated;
+  var valid = (value instanceof options.deprecated || typeof(value) === typeof(options.deprecated.call()));
 
   if (valid) {
     var message = util.format('%s should not be of type "%s"', util.inspect(value), options.deprecated.name);
@@ -20,7 +20,10 @@ var validateDeprecation = function(value, expectation, options) {
 };
 
 var validate = function(value, expectation, options) {
-  if (value instanceof expectation) {
+
+  // the second part of this check is a workaround to deal with an issue that occurs in node-webkit when
+  // using object literals.  https://github.com/sequelize/sequelize/issues/2685
+  if (value instanceof expectation || typeof(value) === typeof(expectation.call())) {
     return true;
   }
 
@@ -53,3 +56,4 @@ var ParameterValidator = module.exports = {
       || validate(value, expectation, options);
   }
 };
+