Handle undefined and boolean
This commit is contained in:
parent
1f31c86169
commit
e9eb9376fe
10
lib/mysql.js
10
lib/mysql.js
|
@ -195,9 +195,17 @@ MySQL.prototype.fromDatabase = function (model, data) {
|
||||||
var props = this._models[model].properties;
|
var props = this._models[model].properties;
|
||||||
Object.keys(data).forEach(function (key) {
|
Object.keys(data).forEach(function (key) {
|
||||||
var val = data[key];
|
var val = data[key];
|
||||||
|
if (typeof val === 'undefined' || val === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (props[key]) {
|
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'));
|
val = new Date(val.toString().replace(/GMT.*$/, 'GMT'));
|
||||||
|
break;
|
||||||
|
case 'Boolean':
|
||||||
|
val = new Boolean(val);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
data[key] = val;
|
data[key] = val;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"test": "make test"
|
"test": "make test"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jugglingdb": "latest",
|
"jugglingdb": "=> 0",
|
||||||
"mysql": ">= 2.0.0-alpha3"
|
"mysql": ">= 2.0.0-alpha3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
Loading…
Reference in New Issue