fix(mariadb): named timezone support (#10705)

sequelize · Apr 8, 2019 · 175da2d · 175da2d
1 parent d6daaf1
commit 175da2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/dialects/mariadb/connection-manager.js b/lib/dialects/mariadb/connection-manager.js
@@ -54,13 +54,18 @@ class ConnectionManager extends AbstractConnectionManager {
    * @private
    */
   connect(config) {
+    // Named timezone is not supported in mariadb, convert to offset
+    let tzOffset = this.sequelize.options.timezone;
+    tzOffset = /\//.test(tzOffset) ? momentTz.tz(tzOffset).format('Z')
+      : tzOffset;
+
     const connectionConfig = {
       host: config.host,
       port: config.port,
       user: config.username,
       password: config.password,
       database: config.database,
-      timezone: this.sequelize.options.timezone,
+      timezone: tzOffset,
       typeCast: ConnectionManager._typecast.bind(this),
       bigNumberStrings: false,
       supportBigNumbers: true,
@@ -73,10 +78,6 @@ class ConnectionManager extends AbstractConnectionManager {
 
     if (!this.sequelize.config.keepDefaultTimezone) {
       // set timezone for this connection
-      // but named timezone are not directly supported in mariadb, so get its offset first
-      let tzOffset = this.sequelize.options.timezone;
-      tzOffset = /\//.test(tzOffset) ? momentTz.tz(tzOffset).format('Z')
-        : tzOffset;
       if (connectionConfig.initSql) {
         if (!Array.isArray(
           connectionConfig.initSql)) {

diff --git a/test/integration/timezone.test.js b/test/integration/timezone.test.js
@@ -38,7 +38,7 @@ if (dialect !== 'sqlite') {
       });
     });
 
-    if (dialect === 'mysql') {
+    if (dialect === 'mysql' || dialect === 'mariadb') {
       it('handles existing timestamps', function() {
         const NormalUser = this.sequelize.define('user', {}),
           TimezonedUser = this.sequelizeWithTimezone.define('user', {});