moved postgres connection uri generation into query-generator

lib/dialects/postgres/connector-manager.js

@@ -44,18 +44,10 @@ module.exports = (function() {
     this.isConnecting = true
     this.isConnected  = false
 
-    var conStr = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';    
-    conStr = Utils._.template(conStr)({
-      user: this.config.username,
-      password: this.config.password,
-      database: this.config.database,
-      host: this.config.host,
-      port: this.config.port,
-      protocol: this.config.protocol,
-    })
+    var pg  = require("pg")
+      , uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
 
-    var pg = require("pg")
-    this.client = new pg.Client(conStr)
+    this.client = new pg.Client(uri)
 
     this.client.connect(function(err, client) {
       self.isConnecting = false

lib/dialects/postgres/query-generator.js

 var Utils = require("../../utils")
-  , util  = require("util") 
+  , util  = require("util")
   , tables = {}
   , primaryKeys = {};
 
@@ -380,6 +380,19 @@ module.exports = (function() {
       })
 
       return Utils._.compact(fields)
+    },
+
+    databaseConnectionUri: function(config) {
+      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
+
+      return Utils._.template(template)({
+        user: config.username,
+        password: config.password,
+        database: config.database,
+        host: config.host,
+        port: config.port,
+        protocol: config.protocol
+      })
     }
   }
 

lib/dialects/query.js

@@ -20,6 +20,5 @@ module.exports = (function() {
     return this
   }
 
-
   return Query
 })()