From cee63034540d7e78159c98e7666950f4056284ac Mon Sep 17 00:00:00 2001 From: Buck Bito Date: Thu, 27 Apr 2017 11:30:00 -0700 Subject: [PATCH] Add new type DateString to fromColumnValue To sync with loopback-datasource-juggler #1356 which introduces new Type: DateString --- lib/mysql.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/mysql.js b/lib/mysql.js index 13827a7..fd01fc1 100644 --- a/lib/mysql.js +++ b/lib/mysql.js @@ -352,6 +352,9 @@ MySQL.prototype.toColumnValue = function(prop, val) { } return val; } + if (prop.type.name === 'DateString') { + return val.when; + } if (prop.type === Boolean) { return !!val; } @@ -405,11 +408,11 @@ MySQL.prototype.fromColumnValue = function(prop, val) { val = String(val); break; case 'Date': - + case 'DateString': // MySQL allows, unless NO_ZERO_DATE is set, dummy date/time entries // new Date() will return Invalid Date for those, so we need to handle // those separate. - if (val == '0000-00-00 00:00:00') { + if (!val || val == '0000-00-00 00:00:00' || val == '0000-00-00') { val = null; } break;