Merge pull request #5044 from sushantdhiman/fix-4307

Postgres named timezone issue

changelog.md

 # Future
 # Future
+- [FIXED] Postgres issue when using named timezone  [#4307](https://github.com/sequelize/sequelize/issues/4307)
 - [ADDED] Improve support for pg range type to handle unbound ranges, +/-infinity bounds and empty ranges
 - [ADDED] Improve support for pg range type to handle unbound ranges, +/-infinity bounds and empty ranges
 - [FIXED] Add support for Babel/ES6 imports [#4881](https://github.com/sequelize/sequelize/issues/4881)
 - [FIXED] Add support for Babel/ES6 imports [#4881](https://github.com/sequelize/sequelize/issues/4881)
 # 3.14.2
 # 3.14.2

lib/dialects/postgres/connection-manager.js

@@ -6,7 +6,8 @@ var AbstractConnectionManager = require('../abstract/connection-manager')
   , Promise = require('../../promise')
   , Promise = require('../../promise')
   , sequelizeErrors = require('../../errors')
   , sequelizeErrors = require('../../errors')
   , semver = require('semver')
   , semver = require('semver')
-  , dataTypes = require('../../data-types');
+  , dataTypes = require('../../data-types')
+  , moment = require('moment-timezone');
 
 
 ConnectionManager = function(dialect, sequelize) {
 ConnectionManager = function(dialect, sequelize) {
   AbstractConnectionManager.call(this, dialect, sequelize);
   AbstractConnectionManager.call(this, dialect, sequelize);
@@ -129,8 +130,13 @@ ConnectionManager.prototype.connect = function(config) {
     }
     }
 
 
     if (!self.sequelize.config.keepDefaultTimezone) {
     if (!self.sequelize.config.keepDefaultTimezone) {
+      var isZone = !!moment.tz.zone(self.sequelize.options.timezone);
+      if (isZone) {
+        query += 'SET client_min_messages TO warning; SET TIME ZONE \'' + self.sequelize.options.timezone + '\'';
+      } else {
         query += 'SET client_min_messages TO warning; SET TIME ZONE INTERVAL \'' + self.sequelize.options.timezone + '\' HOUR TO MINUTE;';
         query += 'SET client_min_messages TO warning; SET TIME ZONE INTERVAL \'' + self.sequelize.options.timezone + '\' HOUR TO MINUTE;';
       }
       }
+    }
 
 
     // oids for hstore and geometry are dynamic - so select them at connection time
     // oids for hstore and geometry are dynamic - so select them at connection time
     if (dataTypes.HSTORE.types.postgres.oids.length === 0) {
     if (dataTypes.HSTORE.types.postgres.oids.length === 0) {

test/integration/dialects/postgres/connection-manager.test.js

+'use strict';
+
+/* jshint -W030 */
+var chai = require('chai')
+  , expect = chai.expect
+  , Support = require(__dirname + '/../../support')
+  , dialect = Support.getTestDialect()
+  , DataTypes = require(__dirname + '/../../../../lib/data-types')
+  , _ = require('lodash');
+
+if (dialect.match(/^postgres/)) {
+  describe('[POSTGRES] Sequelize', function() {
+    it('should correctly parse the moment based timezone', function() {
+      var options = _.extend(this.sequelize.options, { timezone: 'Asia/Kolkata', timestamps: true });
+      var sequelize = Support.createSequelizeInstance(options);
+
+      var tzTable = sequelize.define('tz_table', { foo: DataTypes.STRING });
+      return tzTable.sync({force: true}).then(function() {
+        return tzTable.create({foo: 'test'}).then(function(row) {
+          expect(row).to.be.not.null;
+        });
+      });
+    });
+  });
+}