prostgles-server 4.2.13 → 4.2.15
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/dist/DboBuilder/TableHandler/insert.js +1 -1
- package/dist/DboBuilder/TableHandler/insert.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +6 -8
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/lib/DboBuilder/TableHandler/insert.ts +1 -1
- package/lib/DboBuilder/dboBuilderUtils.ts +6 -8
- package/package.json +1 -1
- package/tests/clientRestApi.spec.ts +4 -4
- package/tests/isomorphicQueries.spec.ts +29 -8
- package/tests/server/package-lock.json +1 -1
|
@@ -114,7 +114,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
114
114
|
if (this.dboBuilder.prostgles.opts.DEBUG_MODE) {
|
|
115
115
|
console.log(this.tx?.t.ctx?.start, "insert in " + this.name, data);
|
|
116
116
|
}
|
|
117
|
-
return (0, runInsertUpdateQuery_1.runInsertUpdateQuery)({
|
|
117
|
+
return await (0, runInsertUpdateQuery_1.runInsertUpdateQuery)({
|
|
118
118
|
rule,
|
|
119
119
|
localParams,
|
|
120
120
|
queryWithoutUserRLS,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insert.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insert.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dboBuilderUtils.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,WAAW,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,EAAE,EACF,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAO,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAKrE;AAED,eAAO,MAAM,gBAAgB,aAAc,GAAG,gCAa7C,CAAA;AAED,KAAK,uCAAuC,GAAG;IAC7C,IAAI,EAAE,KAAK,CAAC;CACb,GAAG;IACF,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAA;AACD,wBAAgB,mCAAmC,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,uCAAuC,
|
|
1
|
+
{"version":3,"file":"dboBuilderUtils.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,WAAW,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,EAAE,EACF,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAO,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAKrE;AAED,eAAO,MAAM,gBAAgB,aAAc,GAAG,gCAa7C,CAAA;AAED,KAAK,uCAAuC,GAAG;IAC7C,IAAI,EAAE,KAAK,CAAC;CACb,GAAG;IACF,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAA;AACD,wBAAgB,mCAAmC,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,uCAAuC,OAoC/G;AACD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,uCAAuC,kBAErG;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAejE;AAED,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,OAAO,EACL,GAAG,GACH,GAAG,GACH,GAAG,CAAA;IAEL;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,cAAc,mBAA0B,oBAAoB,CAAC,QAAQ,CAAC,KAAG,QAAQ,YAAY,EAAE,CAW3G,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAE9D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,uBAAuB,GAAG,MAAM,OAAO,WAAW,CAKjG;AAED,eAAO,MAAM,mBAAmB,UAAW,QAAQ,EAAE,eAAe,MAAM,KAAG,MAAM,EAWlF,CAAA;AAED,eAAO,MAAM,UAAU,8BAUtB,CAAA;AAED,eAAO,MAAM,WAAW,gBAAiB,WAAW,GAAG,SAAS,SAAS,MAAM,WAU9E,CAAA"}
|
|
@@ -38,19 +38,17 @@ function getSerializedClientErrorFromPGError(rawError, args) {
|
|
|
38
38
|
if (process.env.PRGL_DEBUG) {
|
|
39
39
|
console.trace(err);
|
|
40
40
|
}
|
|
41
|
-
const fullError = {
|
|
42
|
-
...err,
|
|
43
|
-
...(err?.message ? { txt: err.message } : {}),
|
|
44
|
-
code_info: (0, sqlErrCodeToMsg_1.sqlErrCodeToMsg)(err.code),
|
|
45
|
-
};
|
|
46
41
|
if (args.type === "sql") {
|
|
47
|
-
return
|
|
42
|
+
return {
|
|
43
|
+
...err,
|
|
44
|
+
...(err?.message ? { txt: err.message } : {}),
|
|
45
|
+
code_info: (0, sqlErrCodeToMsg_1.sqlErrCodeToMsg)(err.code),
|
|
46
|
+
};
|
|
48
47
|
}
|
|
49
48
|
const { localParams, view, allowedKeys } = args;
|
|
50
49
|
const errObject = {
|
|
51
50
|
...((!localParams || !localParams.socket) ? err : {}),
|
|
52
|
-
...(0, PubSubManager_1.pickKeys)(err, ["column", "code", "table", "constraint", "hint"]),
|
|
53
|
-
fullError
|
|
51
|
+
...(0, PubSubManager_1.pickKeys)(err, ["column", "code", "table", "constraint", "hint", "severity", "message", "name", "detail"]),
|
|
54
52
|
};
|
|
55
53
|
if (view?.dboBuilder?.constraints && errObject.constraint && !errObject.column) {
|
|
56
54
|
const constraint = view.dboBuilder.constraints
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dboBuilderUtils.js","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":";AACA;;;gGAGgG;;;AAEhG,qDAOyB;AAKzB,kEAA0D;AAC1D,uDAA+D;AAC/D,8DAA0D;AAE1D,mFAAkE;AAElE,uDAAoD;AACpD,SAAgB,aAAa,CAAC,GAAW,EAAE,UAAU,GAAG,KAAK;IAC3D,IAAI,GAAG,GAAG,GAAG,CAAC;IACd,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,yBAAyB,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AALD,sCAKC;AAEM,MAAM,gBAAgB,GAAG,CAAC,QAAa,EAAE,YAAY,GAAG,KAAK,EAAE,EAAE;IACtE,IAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,QAAQ,CAAC,EAAC,CAAC;QAC5D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC/B,CAAC;IACD,IAAG,QAAQ,YAAY,KAAK,EAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1F,IAAG,CAAC,YAAY,EAAC,CAAC;YAChB,OAAO,IAAA,0BAAQ,EAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA;AAbY,QAAA,gBAAgB,oBAa5B;AAUD,SAAgB,mCAAmC,CAAC,QAAa,EAAE,IAA6C;IAC9G,MAAM,GAAG,GAAG,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"dboBuilderUtils.js","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -129,7 +129,7 @@ export async function insert(this: TableHandler, rowOrRows: AnyObject | AnyObjec
|
|
|
129
129
|
console.log(this.tx?.t.ctx?.start, "insert in " + this.name, data);
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
-
return runInsertUpdateQuery({
|
|
132
|
+
return await runInsertUpdateQuery({
|
|
133
133
|
rule,
|
|
134
134
|
localParams,
|
|
135
135
|
queryWithoutUserRLS,
|
|
@@ -58,22 +58,20 @@ export function getSerializedClientErrorFromPGError(rawError: any, args: GetSeri
|
|
|
58
58
|
if (process.env.PRGL_DEBUG) {
|
|
59
59
|
console.trace(err)
|
|
60
60
|
}
|
|
61
|
-
const fullError = {
|
|
62
|
-
...err,
|
|
63
|
-
...(err?.message ? { txt: err.message } : {}),
|
|
64
|
-
code_info: sqlErrCodeToMsg(err.code),
|
|
65
|
-
}
|
|
66
61
|
|
|
67
62
|
if(args.type === "sql"){
|
|
68
|
-
return
|
|
63
|
+
return {
|
|
64
|
+
...err,
|
|
65
|
+
...(err?.message ? { txt: err.message } : {}),
|
|
66
|
+
code_info: sqlErrCodeToMsg(err.code),
|
|
67
|
+
}
|
|
69
68
|
}
|
|
70
69
|
|
|
71
70
|
const { localParams, view, allowedKeys } = args;
|
|
72
71
|
|
|
73
72
|
const errObject = {
|
|
74
73
|
...((!localParams || !localParams.socket) ? err : {}),
|
|
75
|
-
...pickKeys(err, ["column", "code", "table", "constraint", "hint"]),
|
|
76
|
-
fullError
|
|
74
|
+
...pickKeys(err, ["column", "code", "table", "constraint", "hint", "severity", "message", "name", "detail"]),
|
|
77
75
|
};
|
|
78
76
|
if (view?.dboBuilder?.constraints && errObject.constraint && !errObject.column) {
|
|
79
77
|
const constraint = view.dboBuilder.constraints
|
package/package.json
CHANGED
|
@@ -41,17 +41,17 @@ export const clientRestApi = async(db: DBHandlerClient, auth: Auth, log: (...arg
|
|
|
41
41
|
await test("Rest api test", async () => {
|
|
42
42
|
const dataFilter = { id: 123123123, last_updated: Date.now() };
|
|
43
43
|
const dataFilter1 = { id: 123123124, last_updated: Date.now() };
|
|
44
|
-
await db.planes.insert(dataFilter);
|
|
45
|
-
const item = await db.planes.findOne(dataFilter);
|
|
44
|
+
await db.planes.insert?.(dataFilter);
|
|
45
|
+
const item = await db.planes.findOne?.(dataFilter);
|
|
46
46
|
const itemR = await dbRest("planes", "findOne", dataFilter);
|
|
47
47
|
const itemRNA = await dbRestNoAuth("planes", "findOne", dataFilter);
|
|
48
48
|
assert.deepStrictEqual(item, itemR);
|
|
49
|
-
const { last_updated, ...allowedData } = item
|
|
49
|
+
const { last_updated, ...allowedData } = item!;
|
|
50
50
|
assert.deepStrictEqual(allowedData, itemRNA);
|
|
51
51
|
|
|
52
52
|
await dbRest("planes", "insert", dataFilter1);
|
|
53
53
|
const filter = { "id.>=": dataFilter.id }
|
|
54
|
-
const count = await db.planes.count(filter)
|
|
54
|
+
const count = await db.planes.count?.(filter)
|
|
55
55
|
const restCount = await dbRest("planes", "count", filter);
|
|
56
56
|
assert.equal(count, 2);
|
|
57
57
|
assert.equal(restCount, 2);
|
|
@@ -3,11 +3,12 @@ import * as fs from "fs";
|
|
|
3
3
|
import { DBOFullyTyped } from "../dist/DBSchemaBuilder";
|
|
4
4
|
import type { DBHandlerClient } from "./client/index";
|
|
5
5
|
import { test, describe } from "node:test";
|
|
6
|
+
import { pickKeys } from "prostgles-types";
|
|
6
7
|
|
|
7
8
|
|
|
8
9
|
export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log: (msg: string, extra?: any) => void) => {
|
|
9
10
|
log("Starting isomorphic queries");
|
|
10
|
-
|
|
11
|
+
const isServer = !!(db.items as any).dboBuilder;
|
|
11
12
|
await describe("Isomorphic queries", async () => {
|
|
12
13
|
await test("Deleting stale data", async () => {
|
|
13
14
|
const itemsCount = await db.items.count!()
|
|
@@ -26,6 +27,26 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
|
|
|
26
27
|
|
|
27
28
|
});
|
|
28
29
|
|
|
30
|
+
await test("Insert error structure", async () => {
|
|
31
|
+
const err = await db.items.insert!({ h: "a" }).catch(err => err);
|
|
32
|
+
const clientOnlyError = {
|
|
33
|
+
detail: 'Array value must start with "{" or dimension information.',
|
|
34
|
+
message: 'malformed array literal: "a"',
|
|
35
|
+
code: '22P02',
|
|
36
|
+
name: 'error',
|
|
37
|
+
severity: 'ERROR',
|
|
38
|
+
stack: [
|
|
39
|
+
'dbo.items.insert()'
|
|
40
|
+
]
|
|
41
|
+
}
|
|
42
|
+
if(isServer){
|
|
43
|
+
assert.deepStrictEqual(pickKeys(err, Object.keys(clientOnlyError)), clientOnlyError);
|
|
44
|
+
assert.equal(typeof err.query, "string");
|
|
45
|
+
} else {
|
|
46
|
+
assert.deepStrictEqual(err, clientOnlyError);
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
|
|
29
50
|
await test("Prepare data", async () => {
|
|
30
51
|
if(!db.sql) throw "db.sql missing";
|
|
31
52
|
const res = await db.items.insert!([{ name: "a" }, { name: "a" }, { name: "b" }], { returning: "*" });
|
|
@@ -771,7 +792,7 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
|
|
|
771
792
|
select: {
|
|
772
793
|
"*": 1,
|
|
773
794
|
items3: "*",
|
|
774
|
-
items22: db.leftJoin
|
|
795
|
+
items22: db.leftJoin?.items2({}, "*")
|
|
775
796
|
}
|
|
776
797
|
});
|
|
777
798
|
|
|
@@ -827,8 +848,8 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
|
|
|
827
848
|
const rowhash = await db.items.findOne!({}, { select: { $rowhash: 1, "*": 1 }});
|
|
828
849
|
const f = { $rowhash: rowhash.$rowhash };
|
|
829
850
|
const rowhashView = await db.v_items.findOne!({}, { select: { $rowhash: 1 }});
|
|
830
|
-
const rh1 = await db.items.findOne!({ $rowhash: rowhash
|
|
831
|
-
const rhView = await db.v_items.findOne!({ $rowhash: rowhashView
|
|
851
|
+
const rh1 = await db.items.findOne!({ $rowhash: rowhash?.$rowhash }, { select: { $rowhash: 1 }});
|
|
852
|
+
const rhView = await db.v_items.findOne!({ $rowhash: rowhashView?.$rowhash }, { select: { $rowhash: 1 }});
|
|
832
853
|
// console.log({ rowhash, f });
|
|
833
854
|
|
|
834
855
|
await db.items.update!(f, { name: 'a' });
|
|
@@ -836,10 +857,10 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
|
|
|
836
857
|
// console.log(rowhash, rh1)
|
|
837
858
|
// console.log(rowhashView, rhView)
|
|
838
859
|
if(
|
|
839
|
-
typeof rowhash
|
|
840
|
-
typeof rowhashView
|
|
841
|
-
rowhash.$rowhash !== rh1
|
|
842
|
-
rowhashView.$rowhash !== rhView
|
|
860
|
+
typeof rowhash?.$rowhash !== "string" ||
|
|
861
|
+
typeof rowhashView?.$rowhash !== "string" ||
|
|
862
|
+
rowhash.$rowhash !== rh1?.$rowhash ||
|
|
863
|
+
rowhashView.$rowhash !== rhView?.$rowhash
|
|
843
864
|
){
|
|
844
865
|
throw "$rowhash query failed";
|
|
845
866
|
}
|