pipework 0.189.0 → 0.190.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/CHANGELOG.md +13 -0
- package/dist/data/db/aggregates.d.ts.map +1 -1
- package/dist/data/db/aggregates.js +1 -6
- package/dist/data/db/aggregates.js.map +1 -1
- package/dist/data/query/pg-core/columns/common.js +1 -1
- package/dist/data/query/pg-core/columns/common.js.map +1 -1
- package/dist/data/query/pg-core/utils/array.js +1 -1
- package/dist/data/query/pg-core/utils/array.js.map +1 -1
- package/dist/data/query/postgres-js/array-parser.d.ts +7 -0
- package/dist/data/query/postgres-js/array-parser.d.ts.map +1 -0
- package/dist/data/query/postgres-js/array-parser.js +49 -0
- package/dist/data/query/postgres-js/array-parser.js.map +1 -0
- package/dist/data/query/postgres-js/driver.d.ts.map +1 -1
- package/dist/data/query/postgres-js/driver.js +31 -1
- package/dist/data/query/postgres-js/driver.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.190.0
|
|
4
|
+
|
|
5
|
+
- **Fixed: a NULL element in an array read back wrong** (#747). On every path (column selects, `db.execute`, `arrayAgg`) an unquoted NULL element now reads as `null`, for every array type:
|
|
6
|
+
- Numeric arrays used to give `NaN`, and bigint arrays threw `Cannot convert NULL to a BigInt`.
|
|
7
|
+
- `text[]`, `uuid[]` and enum arrays gave the string `'NULL'`, which a real `'NULL'` string couldn't be told apart from.
|
|
8
|
+
- `bool[]` gave `false`.
|
|
9
|
+
- `jsonb[]` threw on parse.
|
|
10
|
+
- Date and timestamp array columns gave `Invalid Date`.
|
|
11
|
+
|
|
12
|
+
A quoted `"NULL"` string stays a string, and a float `NaN` stays `NaN`.
|
|
13
|
+
- The fix replaces the driver's array parser for every array type it learns at connect, enums and domains included. An enum created after a connection opened is learned by connections opened after it.
|
|
14
|
+
- `db.execute` now returns a `numeric[]` as an array of strings (`['1.5', null]`) instead of the text `'{1.5,NULL}'`.
|
|
15
|
+
|
|
3
16
|
## 0.189.0
|
|
4
17
|
|
|
5
18
|
- **Added: a step's own priority** (#744). `steps: { shadow: { priority: -100, … } }` queues that step's jobs at its own priority instead of the run's, in every run and for every fan-out instance. Higher priorities are claimed first, across runs, per worker class. A measurement step set below every run priority waits behind every other step on its workers, and its run still finishes and records as before. The steps it needs, the steps that need it and the run's finish job keep the run's priority.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregates.d.ts","sourceRoot":"","sources":["../../../src/data/db/aggregates.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,GAAG,EAAE,GAAG,EAAoB,MAAM,mBAAmB,CAAA;AACtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAMrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7C,8GAA8G;AAC9G,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG;IAClC,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;CAChD,CAAA;AAED,8FAA8F;AAC9F,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG;IAC9C,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;IACjB,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG;QAAE,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;KAAE,CAAA;CACxE,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAClB,CAAC,SAAS,IAAI,GAAG,SAAS,GAAG,CAAC,GAC5B,CAAC,SAAS,IAAI,GAAG,MAAM,GACvB,CAAC,SAAS,MAAM,GAAG,MAAM,GACzB,CAAC,SAAS,UAAU,GAAG,MAAM,GAC7B,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,GAC5C,CAAC,SAAS,MAAM,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACnD,CAAC,CAAA;AAEL,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;AAC5G,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;AAC1F,+FAA+F;AAC/F,KAAK,WAAW,CAAC,CAAC,IAChB,CAAC,SAAS,MAAM,GACZ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,WAAW,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,GAC/H,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAA;AAElD,2FAA2F;AAC3F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;CAC5C;
|
|
1
|
+
{"version":3,"file":"aggregates.d.ts","sourceRoot":"","sources":["../../../src/data/db/aggregates.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,14 +20,9 @@ function arrayDecoder(arg) {
|
|
|
20
20
|
: arg.decoder !== noopDecoder
|
|
21
21
|
? (v) => arg.decoder.mapFromDriverValue(v)
|
|
22
22
|
: undefined;
|
|
23
|
-
const integral = is(arg, DrizzleColumn) && ['PgInteger', 'PgSmallInt', 'PgSerial', 'PgSmallSerial'].includes(arg.columnType);
|
|
24
23
|
return {
|
|
25
24
|
mapFromDriverValue(value) {
|
|
26
|
-
|
|
27
|
-
// Only arrays of date/time types arrive as text, so an unquoted NULL element is never a string.
|
|
28
|
-
const list = typeof value === 'string'
|
|
29
|
-
? parsePgArray(value).map(v => (v === 'NULL' ? null : v))
|
|
30
|
-
: Array.isArray(value) && integral ? value.map(v => (Number.isNaN(v) ? null : v)) : value; // the driver parses a NULL in an int[] as NaN
|
|
25
|
+
const list = typeof value === 'string' ? parsePgArray(value) : value;
|
|
31
26
|
if (element === undefined || !Array.isArray(list))
|
|
32
27
|
return list;
|
|
33
28
|
return list.map(v => (v === null || v === undefined ? v : element(v)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../../../src/data/db/aggregates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEtG,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AA0C9B,SAAS,UAAU,CAAI,IAAY;IACjC,MAAM,GAAG,GAAG,IAAoB,CAAA;IAChC,GAAG,CAAC,WAAW,GAAG,CAAC,SAAS,EAAE,EAAE;QAC9B,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO,IAAI,CAAA;QACxC,OAAO,GAAG,CAAA,GAAG,IAAI,kBAAkB,SAAS,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAW,CAAA;IACjF,CAAC,CAAA;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,uHAAuH;AACvH,SAAS,YAAY,CAAC,GAAiB;IACrC,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC;QACpC,CAAC,CAAC,CAAC,CAAU,EAAE,EAAE,CAAE,GAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACvD,CAAC,CAAE,GAAW,CAAC,OAAO,KAAK,WAAW;YACpC,CAAC,CAAC,CAAC,CAAU,EAAE,EAAE,CAAE,GAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,SAAS,CAAA;IACf,
|
|
1
|
+
{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../../../src/data/db/aggregates.ts"],"names":[],"mappings":"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"}
|
|
@@ -174,7 +174,7 @@ export class PgArray extends PgColumn {
|
|
|
174
174
|
// Thank you node-postgres for not parsing enum arrays
|
|
175
175
|
value = parsePgArray(value);
|
|
176
176
|
}
|
|
177
|
-
return value.map((v) => this.baseColumn.mapFromDriverValue(v));
|
|
177
|
+
return value.map((v) => (v === null ? null : this.baseColumn.mapFromDriverValue(v)));
|
|
178
178
|
}
|
|
179
179
|
mapToDriverValue(value, isNestedArray = false) {
|
|
180
180
|
const a = value.map((v) => v === null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/data/query/pg-core/columns/common.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/data/query/pg-core/columns/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ export function parsePgNestedArray(arrayString, startFrom = 0) {
|
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
54
|
const [value, newStartFrom] = parsePgArrayValue(arrayString, i, false);
|
|
55
|
-
result.push(value);
|
|
55
|
+
result.push(value === 'NULL' ? null : value);
|
|
56
56
|
i = newStartFrom;
|
|
57
57
|
}
|
|
58
58
|
return [result, i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../../src/data/query/pg-core/utils/array.ts"],"names":[],"mappings":"AAAA,SAAS,iBAAiB,CAAC,WAAmB,EAAE,SAAiB,EAAE,QAAiB;IACnF,KAAK,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,CAAC,EAAE,CAAC;YACJ,SAAS;QACV,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAClB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACd,SAAS;QACV,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAClC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;IACF,CAAC;IAED,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,WAAmB,EAAE,SAAS,GAAG,CAAC;IACpE,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,CAAC,GAAG,SAAS,CAAC;IAClB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,OAAO,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAClB,IAAI,eAAe,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjB,CAAC;YACD,eAAe,GAAG,IAAI,CAAC;YACvB,CAAC,EAAE,CAAC;YACJ,SAAS;QACV,CAAC;QAED,eAAe,GAAG,KAAK,CAAC;QAExB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,CAAC,IAAI,CAAC,CAAC;YACP,SAAS;QACV,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,iBAAiB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;YACvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,GAAG,SAAS,CAAC;YACd,SAAS;QACV,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAClB,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,GAAG,SAAS,CAAC;YACd,SAAS;QACV,CAAC;QAED,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,GAAG,iBAAiB,CAAC,WAAW,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../../src/data/query/pg-core/utils/array.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Array-literal parser for postgres.js. Unlike the driver's own, it tells an unquoted NULL
|
|
3
|
+
* element (read as null, element parser not called) from a quoted "NULL" (an ordinary value).
|
|
4
|
+
* postgres.js strips the outermost '{' before calling an array parser; nested lists keep theirs.
|
|
5
|
+
*/
|
|
6
|
+
export declare function parseArrayLiteral(text: string, parser: ((value: string) => unknown) | undefined, delimiter?: string): unknown[];
|
|
7
|
+
//# sourceMappingURL=array-parser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"array-parser.d.ts","sourceRoot":"","sources":["../../../../src/data/query/postgres-js/array-parser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,SAAS,EAAE,SAAS,SAAM,GAAG,OAAO,EAAE,CAuC5H"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Array-literal parser for postgres.js. Unlike the driver's own, it tells an unquoted NULL
|
|
3
|
+
* element (read as null, element parser not called) from a quoted "NULL" (an ordinary value).
|
|
4
|
+
* postgres.js strips the outermost '{' before calling an array parser; nested lists keep theirs.
|
|
5
|
+
*/
|
|
6
|
+
export function parseArrayLiteral(text, parser, delimiter = ',') {
|
|
7
|
+
let i = 0;
|
|
8
|
+
const decode = (raw) => (parser ? parser(raw) : raw);
|
|
9
|
+
function list() {
|
|
10
|
+
const out = [];
|
|
11
|
+
while (i < text.length) {
|
|
12
|
+
const c = text[i];
|
|
13
|
+
if (c === '}') {
|
|
14
|
+
i++;
|
|
15
|
+
return out;
|
|
16
|
+
}
|
|
17
|
+
if (c === delimiter) {
|
|
18
|
+
i++;
|
|
19
|
+
}
|
|
20
|
+
else if (c === '{') {
|
|
21
|
+
i++;
|
|
22
|
+
out.push(list());
|
|
23
|
+
}
|
|
24
|
+
else if (c === '"') {
|
|
25
|
+
let s = '';
|
|
26
|
+
i++;
|
|
27
|
+
while (i < text.length && text[i] !== '"') {
|
|
28
|
+
if (text[i] === '\\')
|
|
29
|
+
i++;
|
|
30
|
+
s += text[i++] ?? '';
|
|
31
|
+
}
|
|
32
|
+
i++; // past closing quote
|
|
33
|
+
out.push(decode(s));
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
let s = '';
|
|
37
|
+
while (i < text.length && text[i] !== delimiter && text[i] !== '}') {
|
|
38
|
+
if (text[i] === '\\')
|
|
39
|
+
i++;
|
|
40
|
+
s += text[i++] ?? '';
|
|
41
|
+
}
|
|
42
|
+
out.push(s === 'NULL' ? null : decode(s));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return out;
|
|
46
|
+
}
|
|
47
|
+
return list();
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=array-parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"array-parser.js","sourceRoot":"","sources":["../../../../src/data/query/postgres-js/array-parser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,MAAgD,EAAE,SAAS,GAAG,GAAG;IAChH,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE7D,SAAS,IAAI;QACZ,MAAM,GAAG,GAAc,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACf,CAAC,EAAE,CAAC;gBACJ,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACrB,CAAC,EAAE,CAAC;YACL,CAAC;iBAAM,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACtB,CAAC,EAAE,CAAC;gBACJ,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAClB,CAAC;iBAAM,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACtB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,CAAC,EAAE,CAAC;gBACJ,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBAC3C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;wBAAE,CAAC,EAAE,CAAC;oBAC1B,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;gBACtB,CAAC;gBACD,CAAC,EAAE,CAAC,CAAC,qBAAqB;gBAC1B,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBACpE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;wBAAE,CAAC,EAAE,CAAC;oBAC1B,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;gBACtB,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../../src/data/query/postgres-js/driver.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,GAAG,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../../src/data/query/postgres-js/driver.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,GAAG,EAAE,MAAM,UAAU,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,OAAO,EAAE,KAAK,aAAa,EAAY,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAG7D,qBAAa,kBAAkB,CAC9B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAC9D,SAAQ,UAAU,CAAC,wBAAwB,EAAE,OAAO,CAAC;IACtD,gBAAyB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAwB;CACrE;AA+ED,wBAAgB,OAAO,CACtB,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC/D,OAAO,SAAS,GAAG,GAAG,GAAG,EAEzB,GAAG,MAAM,EAAE;IACV,OAAO,GAAG,MAAM;CAChB,GAAG;IACH,OAAO,GAAG,MAAM;IAChB,aAAa,CAAC,OAAO,CAAC;CACtB,GAAG;IACH,CACG,aAAa,CAAC,OAAO,CAAC,GACtB,CAAC;QACF,UAAU,EAAE,MAAM,GAAG,CAAC;YAAE,GAAG,CAAC,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;KAChF,GAAG;QACH,MAAM,EAAE,OAAO,CAAC;KAChB,CAAC,CACF;CACD,GACC,kBAAkB,CAAC,OAAO,CAAC,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;CACjB,CA2BA;AAED,yBAAiB,OAAO,CAAC;IACxB,SAAgB,IAAI,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACnF,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,GAC7B,kBAAkB,CAAC,OAAO,CAAC,GAAG;QAChC,OAAO,EAAE,4CAA4C,CAAC;KACtD,CAOA;CACD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import pgClient, {} from 'postgres';
|
|
2
|
+
import { parseArrayLiteral } from './array-parser.js';
|
|
2
3
|
import { entityKind } from '../entity.js';
|
|
3
4
|
import { DefaultLogger } from '../logger.js';
|
|
4
5
|
import { PgDatabase } from '../pg-core/db.js';
|
|
@@ -9,13 +10,42 @@ import { PostgresJsSession } from './session.js';
|
|
|
9
10
|
export class PostgresJsDatabase extends PgDatabase {
|
|
10
11
|
static [entityKind] = 'PostgresJsDatabase';
|
|
11
12
|
}
|
|
13
|
+
const arrayParserInstalled = Symbol('arrayParserInstalled');
|
|
14
|
+
/**
|
|
15
|
+
* postgres.js builds each array type's parser as it learns the type (`addArrayType`) and records it in
|
|
16
|
+
* `options.shared.typeArrayMap`, which it reads fresh each time. Watching that map lets us pin our own
|
|
17
|
+
* array parser (unquoted NULL -> null) for every array type, enums and domains included.
|
|
18
|
+
*/
|
|
19
|
+
function installArrayParser(client) {
|
|
20
|
+
const shared = client.options.shared;
|
|
21
|
+
const parsers = client.options.parsers;
|
|
22
|
+
if (!shared?.typeArrayMap || shared.typeArrayMap[arrayParserInstalled])
|
|
23
|
+
return;
|
|
24
|
+
const known = shared.typeArrayMap;
|
|
25
|
+
shared.typeArrayMap = new Proxy(known, {
|
|
26
|
+
get: (target, key, receiver) => (key === arrayParserInstalled ? true : Reflect.get(target, key, receiver)),
|
|
27
|
+
set(target, key, typarray) {
|
|
28
|
+
target[key] = typarray;
|
|
29
|
+
const element = parsers[Number(key)];
|
|
30
|
+
const delimiter = typarray === 1020 ? ';' : ',';
|
|
31
|
+
const parse = (xs) => parseArrayLiteral(xs, element, delimiter);
|
|
32
|
+
parse.array = true;
|
|
33
|
+
// the driver assigns its own parser right after this; keep ours
|
|
34
|
+
Object.defineProperty(parsers, typarray, { get: () => parse, set: () => { }, enumerable: true, configurable: true });
|
|
35
|
+
return true;
|
|
36
|
+
},
|
|
37
|
+
});
|
|
38
|
+
}
|
|
12
39
|
function construct(client, config = {}) {
|
|
13
40
|
const transparentParser = (val) => val;
|
|
14
41
|
// Override postgres.js default date parsers: https://github.com/porsager/postgres/discussions/761
|
|
15
42
|
for (const type of ['1184', '1082', '1083', '1114', '1182', '1185', '1115', '1231']) {
|
|
16
|
-
|
|
43
|
+
// 1231 (numeric[]) is left to the driver's array parser so a NULL element reads as null, not the text '{..,NULL}'.
|
|
44
|
+
if (type !== '1231')
|
|
45
|
+
client.options.parsers[type] = transparentParser;
|
|
17
46
|
client.options.serializers[type] = transparentParser;
|
|
18
47
|
}
|
|
48
|
+
installArrayParser(client);
|
|
19
49
|
client.options.serializers['114'] = transparentParser;
|
|
20
50
|
client.options.serializers['3802'] = transparentParser;
|
|
21
51
|
const dialect = new PgDialect({ casing: config.casing });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/data/query/postgres-js/driver.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAA6C,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EACN,2BAA2B,EAC3B,6BAA6B,GAG7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAsB,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,OAAO,kBAEX,SAAQ,UAA6C;IACtD,MAAM,CAAmB,CAAC,UAAU,CAAC,GAAW,oBAAoB,CAAC;;AAGtE,SAAS,SAAS,CACjB,MAAW,EACX,SAAiC,EAAE;IAInC,MAAM,iBAAiB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC;IAE5C,kGAAkG;IAClG,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QACrF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAW,CAAC,GAAG,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/data/query/postgres-js/driver.ts"],"names":[],"mappings":"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"}
|