Merge pull request #5442 from sequelize/4208fix

bug(dates/timezone) Fix parsing of dates in mysql when a named timezo…

changelog.md

 # NEXT
 - [FIXED] `updatedAt` and `createdAt` values are now set before validation [#5367](https://github.com/sequelize/sequelize/pull/5367)
 - [FIXED] `describeTable` maintains proper enum casing in mysql [#5321](https://github.com/sequelize/sequelize/pull/5321)
+- [FIXED] Parsing of dates in MySQL, when a named timezone is used [#4208](https://github.com/sequelize/sequelize/issues/4208)
 
 # 3.19.0
 - [ADDED] Geography support for postgres

lib/dialects/mysql/connection-manager.js

@@ -41,7 +41,7 @@ ConnectionManager.prototype.$clearTypeParser = function () {
 
 ConnectionManager.$typecast = function (field, next) {
   if (parserMap[field.type]) {
-    return parserMap[field.type](field);
+    return parserMap[field.type](field, this.sequelize.options);
   }
 
   return next();
@@ -57,7 +57,7 @@ ConnectionManager.prototype.connect = function(config) {
       password: config.password,
       database: config.database,
       timezone: self.sequelize.options.timezone,
-      typeCast: ConnectionManager.$typecast
+      typeCast: ConnectionManager.$typecast.bind(self)
     };
 
     if (config.dialectOptions) {

lib/dialects/mysql/data-types.js

 'use strict';
 
 var wkx = require('wkx')
-  , _ = require('lodash');
+  , _ = require('lodash')
+  , moment = require('moment-timezone');
 
 module.exports = function (BaseTypes) {
   BaseTypes.ABSTRACT.prototype.dialectTypes = 'https://dev.mysql.com/doc/refman/5.7/en/data-types.html';
@@ -39,6 +40,22 @@ module.exports = function (BaseTypes) {
     return date.format('YYYY-MM-DD HH:mm:ss');
   };
 
+  DATE.parse = function (value, options) {
+    value = value.string();
+
+    if (value === null) {
+      return value;
+    }
+
+    if (moment.tz.zone(options.timezone)) {
+      value = moment.tz(value, options.timezone).toDate();
+    } else {
+      value = new Date(value + ' ' + options.timezone);
+    }
+
+    return value;
+  };
+
   var UUID = BaseTypes.UUID.inherits();
 
   UUID.prototype.toSql = function() {

test/integration/timezone.test.js

@@ -44,15 +44,15 @@ if (dialect !== 'sqlite') {
           , TimezonedUser = this.sequelizeWithTimezone.define('user', {});
 
         return this.sequelize.sync({ force: true }).bind(this).then(function() {
-          return TimezonedUser.create({});
-        }).then(function(timezonedUser) {
-          this.timezonedUser = timezonedUser;
-          return NormalUser.findById(timezonedUser.id);
+          return NormalUser.create({});
         }).then(function(normalUser) {
+          this.normalUser = normalUser;
+          return TimezonedUser.findById(normalUser.id);
+        }).then(function(timezonedUser) {
           // Expect 7 hours difference, in milliseconds.
           // This difference is expected since two instances, configured for each their timezone is trying to read the same timestamp
           // this test does not apply to PG, since it stores the timezone along with the timestamp.
-          expect(normalUser.createdAt.getTime() - this.timezonedUser.createdAt.getTime()).to.be.closeTo(60 * 60 * 7 * 1000, 50);
+          expect(this.normalUser.createdAt.getTime() - timezonedUser.createdAt.getTime()).to.be.closeTo(60 * 60 * 7 * 1000, 50);
         });
       });
 
@@ -63,11 +63,13 @@ if (dialect !== 'sqlite') {
         return this.sequelize.sync({ force: true }).bind(this).then(function() {
           return TimezonedUser.create({});
         }).then(function(timezonedUser) {
-          this.timezonedUser = timezonedUser;
-          return NormalUser.findById(timezonedUser.id);
-        }).then(function(normalUser) {
+          return Promise.all([
+            NormalUser.findById(timezonedUser.id),
+            TimezonedUser.findById(timezonedUser.id)
+          ]);
+        }).spread(function(normalUser, timezonedUser) {
           // Expect 5 hours difference, in milliseconds, +/- 1 hour for DST
-          expect(normalUser.createdAt.getTime() - this.timezonedUser.createdAt.getTime()).to.be.closeTo(60 * 60 * 4 * 1000 * -1, 60 * 60 * 1000);
+          expect(normalUser.createdAt.getTime() - timezonedUser.createdAt.getTime()).to.be.closeTo(60 * 60 * 4 * 1000 * -1, 60 * 60 * 1000);
         });
       });
     }