prostgles-server 4.2.71 → 4.2.72
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/.github/workflows/main.yml +3 -3
- package/dist/DboBuilder/runSQL.d.ts.map +1 -1
- package/dist/DboBuilder/runSQL.js +18 -1
- package/dist/DboBuilder/runSQL.js.map +1 -1
- package/lib/DboBuilder/runSQL.ts +17 -2
- package/package.json +2 -2
- package/tests/client/package-lock.json +8 -8
- package/tests/client/package.json +1 -1
- package/tests/config_test/index.ts +2 -12
- package/tests/isomorphicQueries.spec.ts +9 -1
- package/tests/server/package-lock.json +3 -3
- package/tests/config_test/package-lock.json +0 -1462
|
@@ -14,14 +14,14 @@ on:
|
|
|
14
14
|
jobs:
|
|
15
15
|
vm-job:
|
|
16
16
|
runs-on: ubuntu-latest
|
|
17
|
-
timeout-minutes:
|
|
17
|
+
timeout-minutes: 5
|
|
18
18
|
strategy:
|
|
19
19
|
matrix:
|
|
20
|
-
node-version: [
|
|
20
|
+
node-version: [18.x, 20.x]
|
|
21
21
|
|
|
22
22
|
services:
|
|
23
23
|
postgres:
|
|
24
|
-
image: postgis/postgis:
|
|
24
|
+
image: postgis/postgis:16-3.4
|
|
25
25
|
#image: postgres:10.8
|
|
26
26
|
env:
|
|
27
27
|
POSTGRES_USER: api
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAG9E,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAG9E,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,gBAiGtK;AAcD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,iBAyBlD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAiB1E;AAED,eAAO,MAAM,SAAS,cAAqB,SAAS,gBAAgB,WAAW,KAAG,QAAQ,OAAO,CAQhG,CAAA;AAED,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAE7D,CAAA"}
|
|
@@ -51,7 +51,24 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
|
|
|
51
51
|
text: hasParams ? DboBuilder_1.pgp.as.format(queryWithRLS, args) : queryWithRLS,
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
|
-
const
|
|
54
|
+
const params = hasParams ? args : undefined;
|
|
55
|
+
let queryResult;
|
|
56
|
+
if (returnType === "default-with-rollback") {
|
|
57
|
+
const ROLLBACK = "Rollback";
|
|
58
|
+
await db.tx(async (t) => {
|
|
59
|
+
queryResult = await t.result(finalQuery, params);
|
|
60
|
+
/** Rollback */
|
|
61
|
+
return Promise.reject(new Error(ROLLBACK));
|
|
62
|
+
}).catch(e => {
|
|
63
|
+
if (!(e instanceof Error && e.message === ROLLBACK))
|
|
64
|
+
throw e;
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
queryResult = await db.result(finalQuery, params);
|
|
69
|
+
}
|
|
70
|
+
if (!queryResult)
|
|
71
|
+
throw "No query result";
|
|
55
72
|
const { fields, rows } = queryResult;
|
|
56
73
|
const listenHandlers = await onSQLResult.bind(this)(queryWithoutRLS, queryResult, allowListen, localParams);
|
|
57
74
|
if (listenHandlers) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":";;;AAAA,2CAAqF;AAIrF,6CAA8E;AAGvE,KAAK,UAAU,MAAM,CAAmB,eAAuB,EAAE,IAAmC,EAAE,OAA+B,EAAE,WAAyB;IACrK,MAAM,YAAY,GAAG,eAAe,CAAC;IACrC,IAAG,YAAY,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAC,CAAC;QACrG,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,+BAA+B,CAAC,CAAC;QAC9F,IAAG,CAAC,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAC,CAAC;YACnE,MAAM,oLAAoL;gBAC1L,gHAAgH,CAAA;QAClH,CAAC;IACH,CAAC;IAED,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAEhC,IAAI,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,wBAAwB,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,EAAE,GAAe,OAAO,IAAK,EAAiB,CAAC;IAChG,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;IAGrC,MAAM,EAAE,GAAG,WAAW,EAAE,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;IACzC,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAG,WAAW,EAAE,EAAE;YAAE,MAAM,gDAAgD,CAAC;QAC3E,IAAI,CAAC,MAAM;YAAE,MAAM,iCAAiC,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAClH,OAAO,UAAU,CAAC;IAEpB,CAAC;SAAM,IAAI,UAAU,KAAK,oBAAoB,EAAE,CAAC;QAC/C,IAAI,CAAC,MAAM;YAAE,MAAM,iCAAiC,CAAA;QACpD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAEjE,CAAC;SAAM,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,OAAO,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAO,GAAW,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;IAEH,CAAC;IAED,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,eAAe,CAAA;IACvB,CAAC;IAED,IAAI,UAAU,GAAgC,YAAY,GAAG,EAAE,CAAC;IAChE,MAAM,mBAAmB,GAAG,CAAC,UAAU,KAAK,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IACjJ,IAAI,mBAAmB,EAAE,CAAC;QACxB,UAAU,GAAG,IAAI,+BAAE,CAAC;YAClB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY;SACnE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5C,IAAI,WAAwD,CAAC;IAE7D,IAAG,UAAU,KAAK,uBAAuB,EAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,UAAU,CAAC;QAC5B,MAAM,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;YACpB,WAAW,GAAG,MAAM,CAAC,CAAC,MAAM,CAAY,UAAU,EAAE,MAAM,CAAC,CAAC;YAC5D,eAAe;YACf,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACX,IAAG,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC;gBAAE,MAAM,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC;SAAO,CAAC;QACP,WAAW,GAAG,MAAM,EAAE,CAAC,MAAM,CAAY,UAAU,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IACD,IAAG,CAAC,WAAW;QAAE,MAAM,iBAAiB,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAErC,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAC5G,IAAG,cAAc,EAAE,CAAC;QAClB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;IAEjB,CAAC;SAAM,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,CAAC;SAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAElD,CAAC;SAAM,CAAC;QAEN,MAAM,IAAI,GAAiC;YACzC,QAAQ,EAAE,CAAC;YACX,GAAG,WAAW;YACd,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;SAChD,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAjGD,wBAiGC;AAED,MAAM,WAAW,GAAG,KAAK,WAA4B,eAAuB,EAAE,EAAE,OAAO,EAAmC,EAAE,WAAgC,EAAE,WAAyB;IAErL,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,sBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;IAE1F,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,mHAAmH,CAAC,CAAA;QACtJ,IAAI,CAAC,MAAM;YAAE,MAAM,iCAAiC,CAAA;QACpD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC;AACH,CAAC,CAAA;AAEM,KAAK,UAAU,YAAY;IAChC,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,kCAAkC,CAAC,IAAI,EAAE,CAAC;IAChF,IAAI,CAAC,WAAW,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;GAgBtC,CAAC,IAAI,EAAE,CAAC;IACT,IAAI,CAAC,kBAAkB,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;;;;GAK7C,CAAC,CAAC;AACL,CAAC;AAzBD,oCAyBC;AAED,SAAgB,oBAAoB,CAAmB,MAAoB;IACzE,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,IAAI,MAAM,EACxF,KAAK,GAAG,IAAI,CAAC,WAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAC5D,MAAM,GAAG,IAAI,CAAC,kBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,gBAAgB,KAAK,CAAC,CAAC,QAAQ,CAAC,EACzG,UAAU,GAAG,IAAA,6BAAgB,EAAC,QAAQ,CAAC,CAAC;QAE1C,OAAO;YACL,GAAG,CAAC;YACJ,UAAU;YACV,QAAQ;YACR,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,KAAK,EAAE,OAAO;YACzB,WAAW,EAAE,KAAK,EAAE,UAAU;YAC9B,UAAU,EAAE,MAAM,EAAE,WAAW;SAChC,CAAA;IACH,CAAC,CAAC,IAAI,EAAE,CAAC;AACX,CAAC;AAjBD,oDAiBC;AAEM,MAAM,SAAS,GAAG,KAAK,EAAE,SAAoB,EAAE,WAAyB,EAAoB,EAAE;IACnG,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,WAAW,EAAE,OAAO;QAAE,OAAO,IAAI,CAAC;IAE/D,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,aAAc,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAClF,YAAY;IACZ,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,OAAO,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,CAAC,CAAA;AARY,QAAA,SAAS,aAQrB;AAEM,MAAM,eAAe,GAAG,KAAK,EAAE,EAAM,EAAoB,EAAE;IAChE,OAAO,EAAE,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAA;AAC1H,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B"}
|
package/lib/DboBuilder/runSQL.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ParameterizedQuery as PQ, ParameterizedQuery } from 'pg-promise';
|
|
1
|
+
import pgPromise, { ParameterizedQuery as PQ, ParameterizedQuery } from 'pg-promise';
|
|
2
2
|
import pg from "pg-promise/typescript/pg-subset";
|
|
3
3
|
import { AnyObject, SQLOptions, SQLResult, SQLResultInfo } from "prostgles-types";
|
|
4
4
|
import { DB, Prostgles } from "../Prostgles";
|
|
@@ -58,7 +58,22 @@ export async function runSQL(this: DboBuilder, queryWithoutRLS: string, args: un
|
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
const
|
|
61
|
+
const params = hasParams ? args : undefined;
|
|
62
|
+
let queryResult: pgPromise.IResultExt<AnyObject> | undefined;
|
|
63
|
+
|
|
64
|
+
if(returnType === "default-with-rollback"){
|
|
65
|
+
const ROLLBACK = "Rollback";
|
|
66
|
+
await db.tx(async t => {
|
|
67
|
+
queryResult = await t.result<AnyObject>(finalQuery, params);
|
|
68
|
+
/** Rollback */
|
|
69
|
+
return Promise.reject(new Error(ROLLBACK));
|
|
70
|
+
}).catch(e => {
|
|
71
|
+
if(!(e instanceof Error && e.message === ROLLBACK)) throw e;
|
|
72
|
+
});
|
|
73
|
+
} else {
|
|
74
|
+
queryResult = await db.result<AnyObject>(finalQuery, params);
|
|
75
|
+
}
|
|
76
|
+
if(!queryResult) throw "No query result";
|
|
62
77
|
const { fields, rows } = queryResult;
|
|
63
78
|
|
|
64
79
|
const listenHandlers = await onSQLResult.bind(this)(queryWithoutRLS, queryResult, allowListen, localParams);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.72",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"pg-cursor": "^2.10.5",
|
|
44
44
|
"pg-promise": "^11.6.0",
|
|
45
45
|
"prostgles-client": "^4.0.53",
|
|
46
|
-
"prostgles-types": "^4.0.
|
|
46
|
+
"prostgles-types": "^4.0.87"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/bluebird": "^3.5.36",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"license": "ISC",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@types/node": "^20.9.2",
|
|
13
|
-
"prostgles-client": "^4.0.
|
|
13
|
+
"prostgles-client": "^4.0.132",
|
|
14
14
|
"prostgles-types": "^4.0.51",
|
|
15
15
|
"socket.io-client": "^4.7.5"
|
|
16
16
|
},
|
|
@@ -351,11 +351,11 @@
|
|
|
351
351
|
}
|
|
352
352
|
},
|
|
353
353
|
"node_modules/prostgles-client": {
|
|
354
|
-
"version": "4.0.
|
|
355
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.
|
|
356
|
-
"integrity": "sha512-
|
|
354
|
+
"version": "4.0.132",
|
|
355
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.132.tgz",
|
|
356
|
+
"integrity": "sha512-DXYRRw4OszWkZFLGyEltCLV6FIEHOsm01sWWi1RNBOx2OaajF9k7lYfa77SVr21bDQKhkuZsQARWWkQ5vVLo6g==",
|
|
357
357
|
"dependencies": {
|
|
358
|
-
"prostgles-types": "^4.0.
|
|
358
|
+
"prostgles-types": "^4.0.87"
|
|
359
359
|
},
|
|
360
360
|
"peerDependencies": {
|
|
361
361
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -371,9 +371,9 @@
|
|
|
371
371
|
}
|
|
372
372
|
},
|
|
373
373
|
"node_modules/prostgles-types": {
|
|
374
|
-
"version": "4.0.
|
|
375
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.
|
|
376
|
-
"integrity": "sha512-
|
|
374
|
+
"version": "4.0.87",
|
|
375
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.87.tgz",
|
|
376
|
+
"integrity": "sha512-Zk8kz+UHM7k4hq9K2tg3UYRaMOCjOUZcOArnnsWfOzqs9yEUlHwPi8OyN2JsMjvk1FTHqkoIfHy2VgLXcfnnpg==",
|
|
377
377
|
"dependencies": {
|
|
378
378
|
"json-schema": "^0.4.0"
|
|
379
379
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
3
|
/* Dashboard */
|
|
4
|
-
import path from 'path';
|
|
5
4
|
import express from 'express';
|
|
6
5
|
|
|
7
6
|
process.on('unhandledRejection', (reason, p) => {
|
|
@@ -13,18 +12,9 @@ const app = express();
|
|
|
13
12
|
app.use(express.json());
|
|
14
13
|
app.use(express.urlencoded({ extended: true }));
|
|
15
14
|
const _http = require("http");
|
|
16
|
-
const http = _http.createServer(app);
|
|
17
|
-
const io = require("socket.io")(http, {
|
|
18
|
-
path: "/teztz/s",
|
|
19
|
-
// maxHttpBufferSize: 1e8, // 100Mb
|
|
20
|
-
});
|
|
15
|
+
const http = _http.createServer(app);
|
|
21
16
|
http.listen(process.env.NPORT || 3000);
|
|
22
|
-
|
|
23
|
-
const log = (msg: string, extra?: any) => {
|
|
24
|
-
console.log(...["(server): " + msg, extra].filter(v => v));
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
|
|
17
|
+
|
|
28
18
|
|
|
29
19
|
|
|
30
20
|
// import WebSocket from 'ws';
|
|
@@ -359,7 +359,15 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
|
|
|
359
359
|
resV,
|
|
360
360
|
["a", "b"]
|
|
361
361
|
);
|
|
362
|
-
})
|
|
362
|
+
});
|
|
363
|
+
|
|
364
|
+
await test("sql returntype default-with-rollback", async () => {
|
|
365
|
+
const item = { name: "a" };
|
|
366
|
+
const res = await db.sql!("delete from items2 returning name; ", {}, { returnType: "default-with-rollback" });
|
|
367
|
+
assert.deepEqual(res.rows, [item]);
|
|
368
|
+
const count = await db.items2.count!();
|
|
369
|
+
assert.equal(count, 1);
|
|
370
|
+
});
|
|
363
371
|
|
|
364
372
|
/**
|
|
365
373
|
* returnType "value"
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"../..": {
|
|
23
23
|
"name": "prostgles-server",
|
|
24
|
-
"version": "4.2.
|
|
24
|
+
"version": "4.2.71",
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"bluebird": "^3.7.2",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"pg-cursor": "^2.10.5",
|
|
33
33
|
"pg-promise": "^11.6.0",
|
|
34
34
|
"prostgles-client": "^4.0.53",
|
|
35
|
-
"prostgles-types": "^4.0.
|
|
35
|
+
"prostgles-types": "^4.0.87"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/bluebird": "^3.5.36",
|
|
@@ -1546,7 +1546,7 @@
|
|
|
1546
1546
|
"pg-cursor": "^2.10.5",
|
|
1547
1547
|
"pg-promise": "^11.6.0",
|
|
1548
1548
|
"prostgles-client": "^4.0.53",
|
|
1549
|
-
"prostgles-types": "^4.0.
|
|
1549
|
+
"prostgles-types": "^4.0.87",
|
|
1550
1550
|
"typescript": "^5.3.3"
|
|
1551
1551
|
}
|
|
1552
1552
|
},
|