Merge branch 'master' of https://git.citpb.ru/Dollerok/P8-ExchangeService

modules/parus_pg_db.js

@@ -190,13 +190,13 @@ const connect = async prms => {
     try {
         //Создаем пул подключения
         let pool = new pg.Pool({
-            connectionString: `postgres://${prms.connectSettings.sUser}:${prms.connectSettings.sPassword}@${prms.connectSettings.sConnectString}`,
+            connectionString: `postgres://${prms.sUser}:${prms.sPassword}@${prms.sConnectString}`,
             connectionTimeoutMillis: 600000,
-            min: prms.connectSettings.nPoolMin ? prms.connectSettings.nPoolMin : 4,
-            max: prms.connectSettings.nPoolMax ? prms.connectSettings.nPoolMax : 4
+            min: prms.nPoolMin ? prms.nPoolMin : 4,
+            max: prms.nPoolMax ? prms.nPoolMax : 4
         });
         pool.on("acquire", async client => {
-            await client.query(`select ALTER_SESSION_SET_SCHEMA($1);`, [prms.connectSettings.sSchema]);
+            await client.query(`select ALTER_SESSION_SET_SCHEMA($1);`, [prms.sSchema]);
         });
         return pool;
     } catch (e) {