issue 4307 : Added fix in postgres connection manager improved tests

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,7 +130,12 @@ ConnectionManager.prototype.connect = function(config) {
     }
     }
 
 
     if (!self.sequelize.config.keepDefaultTimezone) {
     if (!self.sequelize.config.keepDefaultTimezone) {
-      query += 'SET client_min_messages TO warning; SET TIME ZONE INTERVAL \'' + self.sequelize.options.timezone + '\' HOUR TO MINUTE;';
+      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;';
+      }
     }
     }
 
 
     // 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

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

@@ -5,12 +5,11 @@ var chai = require('chai')
   , expect = chai.expect
   , expect = chai.expect
   , Support = require(__dirname + '/../../support')
   , Support = require(__dirname + '/../../support')
   , dialect = Support.getTestDialect()
   , dialect = Support.getTestDialect()
-  , config = require(__dirname + '/../../../config/config')
   , DataTypes = require(__dirname + '/../../../../lib/data-types')
   , DataTypes = require(__dirname + '/../../../../lib/data-types')
   , _ = require('lodash');
   , _ = require('lodash');
 
 
 if (dialect.match(/^postgres/)) {
 if (dialect.match(/^postgres/)) {
-  describe('[POSTGRES Specific] Sequelize', function() {
+  describe('[POSTGRES] Sequelize', function() {
     it('should correctly parse the moment based timezone', function() {
     it('should correctly parse the moment based timezone', function() {
       var options = _.extend(this.sequelize.options, { timezone: 'Asia/Kolkata', timestamps: true });
       var options = _.extend(this.sequelize.options, { timezone: 'Asia/Kolkata', timestamps: true });
       var sequelize = Support.createSequelizeInstance(options);
       var sequelize = Support.createSequelizeInstance(options);
@@ -19,10 +18,8 @@ if (dialect.match(/^postgres/)) {
       return tzTable.sync({force: true}).then(function() {
       return tzTable.sync({force: true}).then(function() {
         return tzTable.create({foo: 'test'}).then(function(row) {
         return tzTable.create({foo: 'test'}).then(function(row) {
           expect(row).to.be.not.null;
           expect(row).to.be.not.null;
-        }).catch(function(e) {
-          expect(e).to.be.null;
         });
         });
-      })
+      });
     });
     });
   });
   });
 }
 }