Merge pull request #1632 from sangpire/master

Support postgreSQL 'postgresql://' scheme.

lib/sequelize.js

@@ -97,6 +97,10 @@ module.exports = (function() {
       language: 'en'
       language: 'en'
     }, options || {})
     }, options || {})
 
 
+    if (this.options.dialect === 'postgresql') {
+      this.options.dialect = 'postgres'
+    }
+
     if (this.options.logging === true) {
     if (this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
       this.options.logging = console.log

test/sequelize.test.js

@@ -52,6 +52,18 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
         var sequelize = new Sequelize('sqlite://test.sqlite/lol?reconnect=true')
         var sequelize = new Sequelize('sqlite://test.sqlite/lol?reconnect=true')
       })
       })
     }
     }
+
+    if (dialect === 'postgres') {
+      var getConnectionUri = _.template('<%= protocol %>://<%= username %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>')
+      it('should work with connection strings (postgres protocol)', function () {
+        var connectionUri = getConnectionUri(_.extend(config[dialect], {protocol: 'postgres'}))
+        var sequelize = new Sequelize(connectionUri) // postgres://...
+      })
+      it('should work with connection strings (postgresql protocol)', function () {
+        var connectionUri = getConnectionUri(_.extend(config[dialect], {protocol: 'postgresql'}))
+        var sequelize = new Sequelize(connectionUri) // postgresql://...
+      })
+    }
   })
   })
 
 
   if (dialect !== 'sqlite') {
   if (dialect !== 'sqlite') {