Merge branch 'master' into eslint

2019-11-13 19:00:50 +01:00
parent 734c373f3d ccd01e6da5
commit 2c8a030ecb
21 changed files with 333 additions and 133 deletions
@@ -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;
@@ -122,13 +123,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)));
    });
 };