From e9eb9376fee2166536d2dba2e48ccfe50d069aae Mon Sep 17 00:00:00 2001 From: Anatoliy Chakkaev Date: Sat, 6 Apr 2013 14:36:32 +0400 Subject: [PATCH] Handle undefined and boolean --- lib/mysql.js | 10 +++++++++- package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/mysql.js b/lib/mysql.js index f812703..b7253c9 100644 --- a/lib/mysql.js +++ b/lib/mysql.js @@ -195,9 +195,17 @@ MySQL.prototype.fromDatabase = function (model, data) { var props = this._models[model].properties; Object.keys(data).forEach(function (key) { var val = data[key]; + if (typeof val === 'undefined' || val === null) { + return; + } if (props[key]) { - if (props[key].type.name === 'Date' && val !== null) { + switch(props[key].type.name) { + case 'Date': val = new Date(val.toString().replace(/GMT.*$/, 'GMT')); + break; + case 'Boolean': + val = new Boolean(val); + break; } } data[key] = val; diff --git a/package.json b/package.json index f80462d..adca640 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "test": "make test" }, "dependencies": { - "jugglingdb": "latest", + "jugglingdb": "=> 0", "mysql": ">= 2.0.0-alpha3" }, "devDependencies": {