prostgles-server 4.1.121 → 4.1.124
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.
|
@@ -27,7 +27,7 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
|
|
|
27
27
|
if (returnType === "stream") {
|
|
28
28
|
if (!socket)
|
|
29
29
|
throw "Only allowed with client socket";
|
|
30
|
-
const streamInfo = await this.queryStreamer.create({ socket, query:
|
|
30
|
+
const streamInfo = await this.queryStreamer.create({ socket, query: DboBuilder_1.pgp.as.format(queryWithRLS, args) });
|
|
31
31
|
return streamInfo;
|
|
32
32
|
}
|
|
33
33
|
else if (returnType === "noticeSubscription") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":";;;AACA,6CAA8E;AAE9E,kEAA+D;AAC/D,2CAAsD;AAG/C,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;QACpG,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;YAClE,MAAM,oLAAoL;gBAC1L,gHAAgH,CAAA;SACjH;KACF;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;QAAE,MAAM,wBAAwB,CAAC;IAEpF,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;IAErC,IAAI,UAAU,GAAG,YAAY,GAAG,EAAE,CAAC;IACnC,MAAM,mBAAmB,GAAG,UAAU,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5I,IAAI,mBAAmB,EAAE;QACvB,UAAU,GAAG,CAAC,IAAI,+BAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAQ,CAAC;KACxH;IAED,MAAM,EAAE,GAAG,WAAW,EAAE,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;IACzC,IAAI,UAAU,KAAK,QAAQ,EAAE;QAC3B,IAAI,CAAC,MAAM;YAAE,MAAM,iCAAiC,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"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"}
|
package/lib/DboBuilder/runSQL.ts
CHANGED
|
@@ -31,7 +31,7 @@ export async function runSQL(this: DboBuilder, queryWithoutRLS: string, args: un
|
|
|
31
31
|
const db = localParams?.tx?.t || this.db;
|
|
32
32
|
if (returnType === "stream") {
|
|
33
33
|
if (!socket) throw "Only allowed with client socket";
|
|
34
|
-
const streamInfo = await this.queryStreamer.create({ socket, query:
|
|
34
|
+
const streamInfo = await this.queryStreamer.create({ socket, query: pgp.as.format(queryWithRLS, args) });
|
|
35
35
|
return streamInfo;
|
|
36
36
|
|
|
37
37
|
} else if (returnType === "noticeSubscription") {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.124",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -42,7 +42,6 @@
|
|
|
42
42
|
"body-parser": "^1.20.2",
|
|
43
43
|
"check-disk-space": "^3.3.1",
|
|
44
44
|
"file-type": "^18.5.0",
|
|
45
|
-
"pg": "^8.11.3",
|
|
46
45
|
"pg-iterator": "^0.3.0",
|
|
47
46
|
"pg-promise": "^11.5.4",
|
|
48
47
|
"prostgles-client": "^4.0.53",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { strict as assert } from 'assert';
|
|
2
2
|
import type { DBHandlerClient, Auth } from "./client/index";
|
|
3
3
|
import { DBSchemaTable, isDefined } from "prostgles-types";
|
|
4
|
-
import { tryRun, tryRunP } from './isomorphic_queries';
|
|
4
|
+
import { tryRun, tryRunP } from './isomorphic_queries';
|
|
5
5
|
|
|
6
6
|
export default async function client_only(db: DBHandlerClient, auth: Auth, log: (...args: any[]) => any, methods, tableSchema: DBSchemaTable[], token: string){
|
|
7
7
|
await Promise.all([1e3, 1e2].map(async (numberOfRows) => {
|
|
@@ -19,7 +19,35 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
|
|
|
19
19
|
const { stop } = startHandler;
|
|
20
20
|
});
|
|
21
21
|
}));
|
|
22
|
-
|
|
22
|
+
await tryRunP("SQL Stream parallel execution + parameters", async (resolve, reject) => {
|
|
23
|
+
const getExpected = (val: string) => new Promise(async (resolve, reject) => {
|
|
24
|
+
const res = await db.sql!("SELECT ${val} as val", { val }, { returnType: "stream" });
|
|
25
|
+
let rows: any[] = [];
|
|
26
|
+
const listener = async (batchRows) => {
|
|
27
|
+
rows = rows.concat(batchRows);
|
|
28
|
+
try {
|
|
29
|
+
assert.deepStrictEqual(batchRows[0], { val });
|
|
30
|
+
assert.equal(batchRows.length, 1);
|
|
31
|
+
resolve(1);
|
|
32
|
+
} catch(err){
|
|
33
|
+
reject(err);
|
|
34
|
+
stop();
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
const startHandler = await res.start(listener);
|
|
38
|
+
const { stop } = startHandler;
|
|
39
|
+
});
|
|
40
|
+
let resolved = 0;
|
|
41
|
+
const expected = ["a", "b", "c"];
|
|
42
|
+
expected.forEach((val) => {
|
|
43
|
+
getExpected(val).then(() => {
|
|
44
|
+
resolved++;
|
|
45
|
+
if(resolved === expected.length){
|
|
46
|
+
resolve("ok");
|
|
47
|
+
}
|
|
48
|
+
}).catch(reject);
|
|
49
|
+
})
|
|
50
|
+
});
|
|
23
51
|
|
|
24
52
|
|
|
25
53
|
/**
|