Merge branch 'heroku-constring-fix' of https://github.com/danielschwartz/sequeli…

…ze into danielschwartz-heroku-constring-fix

lib/dialects/postgres/connector-manager.js

@@ -44,13 +44,14 @@ module.exports = (function() {
     this.isConnecting = true
     this.isConnecting = true
     this.isConnected  = false
     this.isConnected  = false
 
 
-    var conStr = 'tcp://<%= user %>:<%= password %>@<%= host %>:<%= port %>/<%= database %>'
+    var conStr = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';    
     conStr = Utils._.template(conStr)({
     conStr = Utils._.template(conStr)({
       user: this.config.username,
       user: this.config.username,
       password: this.config.password,
       password: this.config.password,
       database: this.config.database,
       database: this.config.database,
       host: this.config.host,
       host: this.config.host,
-      port: this.config.port
+      port: this.config.port,
+      protocol: this.config.protocol,
     })
     })
 
 
     var pg = require("pg")
     var pg = require("pg")

lib/sequelize.js

@@ -15,6 +15,7 @@ module.exports = (function() {
       dialect: 'mysql',
       dialect: 'mysql',
       host: 'localhost',
       host: 'localhost',
       port: 3306,
       port: 3306,
+      protocol: 'tcp',
       define: {},
       define: {},
       query: {},
       query: {},
       sync: {},
       sync: {},
@@ -32,7 +33,8 @@ module.exports = (function() {
       password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
       password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
       host    : this.options.host,
       host    : this.options.host,
       port    : this.options.port,
       port    : this.options.port,
-      pool    : this.options.pool
+      pool    : this.options.pool,
+      protocol: this.options.protocol
     }
     }
 
 
     var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
     var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")