Fix multiple DB login issues

lib/backends/pg-connection.js

@@ -3,6 +3,7 @@
 var PSQL = require('cartodb-psql');
 var _ = require('underscore');
 const debug = require('debug')('cachechan');
+const dbParamsFromReqParams = require('../utils/database-params');
 
 function PgConnection(metadataBackend) {
     this.metadataBackend = metadataBackend;
@@ -124,14 +125,7 @@ PgConnection.prototype.getConnection = function(username, callback) {
         if (err) {
             return callback(err);
         }
-        return callback(err, new PSQL({
-            user: databaseParams.dbuser,
-            pass: databaseParams.dbpass,
-            host: databaseParams.dbhost,
-            port: databaseParams.dbport,
-            dbname: databaseParams.dbname
-        }));
-
+        return callback(err, new PSQL(dbParamsFromReqParams(databaseParams)));
     });
 };
 

lib/backends/pg-query-runner.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var PSQL = require('cartodb-psql');
+const dbParamsFromReqParams = require('../utils/database-params');
 
 function PgQueryRunner(pgConnection) {
     this.pgConnection = pgConnection;
@@ -22,13 +23,7 @@ PgQueryRunner.prototype.run = function(username, query, callback) {
             return callback(err);
         }
 
-        const psql = new PSQL({
-            user: databaseParams.dbuser,
-            pass: databaseParams.dbpass,
-            host: databaseParams.dbhost,
-            port: databaseParams.dbport,
-            dbname: databaseParams.dbname
-        });
+        const psql = new PSQL(dbParamsFromReqParams(databaseParams));
 
         psql.query(query, function (err, resultSet) {
             resultSet = resultSet || {};