@constructive-io/job-utils 1.1.0 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/runtime.js +2 -5
- package/package.json +4 -4
- package/runtime.js +1 -4
package/esm/runtime.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getEnvOptions, getNodeEnv, parseEnvBoolean } from '@pgpmjs/env';
|
|
2
2
|
import { defaultPgConfig, getPgEnvVars } from 'pg-env';
|
|
3
|
-
import { getPgPool } from 'pg-cache';
|
|
3
|
+
import { buildConnectionString, getPgPool } from 'pg-cache';
|
|
4
4
|
import { jobsDefaults } from '@pgpmjs/types';
|
|
5
5
|
const toStrArray = (v) => v ? v.split(',').map(s => s.trim()).filter(Boolean) : undefined;
|
|
6
6
|
// ---- PG config ----
|
|
@@ -16,10 +16,7 @@ export const getJobPgConfig = () => {
|
|
|
16
16
|
export const getJobPool = () => getPgPool(getJobPgConfig());
|
|
17
17
|
export const getJobConnectionString = () => {
|
|
18
18
|
const cfg = getJobPgConfig();
|
|
19
|
-
|
|
20
|
-
? `${cfg.user}${cfg.password ? `:${cfg.password}` : ''}@`
|
|
21
|
-
: '';
|
|
22
|
-
return `postgres://${auth}${cfg.host}:${cfg.port}/${cfg.database}`;
|
|
19
|
+
return buildConnectionString(cfg.user, cfg.password, cfg.host, cfg.port, cfg.database);
|
|
23
20
|
};
|
|
24
21
|
// ---- Schema ----
|
|
25
22
|
export const getJobSchema = () => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@constructive-io/job-utils",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "job utils",
|
|
5
5
|
"author": "Constructive <developers@constructive.io>",
|
|
6
6
|
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-utils#readme",
|
|
@@ -36,11 +36,11 @@
|
|
|
36
36
|
"makage": "^0.1.12"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@pgpmjs/env": "^2.
|
|
39
|
+
"@pgpmjs/env": "^2.12.0",
|
|
40
40
|
"@pgpmjs/logger": "^2.1.0",
|
|
41
41
|
"@pgpmjs/types": "^2.16.0",
|
|
42
|
-
"pg-cache": "^
|
|
42
|
+
"pg-cache": "^3.0.0",
|
|
43
43
|
"pg-env": "^1.4.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "6dac0247c675de94b41038ac1e5095dc5df0c753"
|
|
46
46
|
}
|
package/runtime.js
CHANGED
|
@@ -21,10 +21,7 @@ const getJobPool = () => (0, pg_cache_1.getPgPool)((0, exports.getJobPgConfig)()
|
|
|
21
21
|
exports.getJobPool = getJobPool;
|
|
22
22
|
const getJobConnectionString = () => {
|
|
23
23
|
const cfg = (0, exports.getJobPgConfig)();
|
|
24
|
-
|
|
25
|
-
? `${cfg.user}${cfg.password ? `:${cfg.password}` : ''}@`
|
|
26
|
-
: '';
|
|
27
|
-
return `postgres://${auth}${cfg.host}:${cfg.port}/${cfg.database}`;
|
|
24
|
+
return (0, pg_cache_1.buildConnectionString)(cfg.user, cfg.password, cfg.host, cfg.port, cfg.database);
|
|
28
25
|
};
|
|
29
26
|
exports.getJobConnectionString = getJobConnectionString;
|
|
30
27
|
// ---- Schema ----
|