@opengis/fastify-table 2.0.124 → 2.0.126
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/script/dump.d.ts +1 -1
- package/dist/script/dump.d.ts.map +1 -1
- package/dist/script/dump.js +6 -3
- package/dist/script/dump.ts +5 -2
- package/dist/server/plugins/crud/funcs/dataDelete.js +6 -6
- package/dist/server/plugins/crud/funcs/dataInsert.d.ts.map +1 -1
- package/dist/server/plugins/crud/funcs/dataInsert.js +13 -13
- package/dist/server/plugins/crud/funcs/dataUpdate.js +6 -6
- package/dist/server/plugins/crud/funcs/dataUpsert.js +6 -6
- package/dist/server/plugins/usercls/index.d.ts +3 -1
- package/dist/server/plugins/usercls/index.d.ts.map +1 -1
- package/dist/server/plugins/usercls/index.js +17 -9
- package/dist/server/routes/usercls/controllers/getUserCls.d.ts.map +1 -1
- package/dist/server/routes/usercls/controllers/getUserCls.js +8 -2
- package/dist/server/types/core.d.ts +1 -0
- package/dist/server/types/core.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/script/dump.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export default function dumpMigrateSQL(): Promise<null
|
|
1
|
+
export default function dumpMigrateSQL(): Promise<null>;
|
|
2
2
|
//# sourceMappingURL=dump.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../script/dump.ts"],"names":[],"mappings":"AAqBA,wBAA8B,cAAc,
|
|
1
|
+
{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../script/dump.ts"],"names":[],"mappings":"AAqBA,wBAA8B,cAAc,kBAgE3C"}
|
package/dist/script/dump.js
CHANGED
|
@@ -6,14 +6,14 @@ import path from "node:path";
|
|
|
6
6
|
import { existsSync } from "node:fs";
|
|
7
7
|
import { mkdir, writeFile, rm } from "node:fs/promises";
|
|
8
8
|
import { config, handlebars, pgClients, getTemplate } from "../utils.js";
|
|
9
|
-
import { build
|
|
9
|
+
import { build } from "../helper.js";
|
|
10
10
|
if (import.meta.main) {
|
|
11
11
|
dumpMigrateSQL();
|
|
12
12
|
}
|
|
13
13
|
const debug = false;
|
|
14
14
|
export default async function dumpMigrateSQL() {
|
|
15
15
|
const app = await build();
|
|
16
|
-
app.addHook("onClose", async () => teardown());
|
|
16
|
+
// app.addHook("onClose", async () => teardown());
|
|
17
17
|
try {
|
|
18
18
|
// const { database, host, port, user, password } = config.pg;
|
|
19
19
|
if (!config.pg) {
|
|
@@ -52,12 +52,15 @@ export default async function dumpMigrateSQL() {
|
|
|
52
52
|
}
|
|
53
53
|
const filepath = await saveFile(dump, tableName || schemaName || "");
|
|
54
54
|
console.log("success", filepath);
|
|
55
|
+
// app.close();
|
|
55
56
|
}
|
|
56
57
|
catch (err) {
|
|
57
58
|
console.error(err);
|
|
59
|
+
// app.close();
|
|
58
60
|
}
|
|
59
61
|
finally {
|
|
60
|
-
app.close();
|
|
62
|
+
await app.close();
|
|
63
|
+
process.exit(0);
|
|
61
64
|
}
|
|
62
65
|
}
|
|
63
66
|
async function saveFile(data, filename) {
|
package/dist/script/dump.ts
CHANGED
|
@@ -21,7 +21,7 @@ const debug = false;
|
|
|
21
21
|
|
|
22
22
|
export default async function dumpMigrateSQL() {
|
|
23
23
|
const app = await build();
|
|
24
|
-
app.addHook("onClose", async () => teardown());
|
|
24
|
+
// app.addHook("onClose", async () => teardown());
|
|
25
25
|
|
|
26
26
|
try {
|
|
27
27
|
// const { database, host, port, user, password } = config.pg;
|
|
@@ -75,10 +75,13 @@ export default async function dumpMigrateSQL() {
|
|
|
75
75
|
|
|
76
76
|
const filepath = await saveFile(dump, tableName || schemaName || "");
|
|
77
77
|
console.log("success", filepath);
|
|
78
|
+
// app.close();
|
|
78
79
|
} catch (err) {
|
|
79
80
|
console.error(err);
|
|
81
|
+
// app.close();
|
|
80
82
|
} finally {
|
|
81
|
-
app.close();
|
|
83
|
+
await app.close();
|
|
84
|
+
process.exit(0);
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
|
|
@@ -10,12 +10,12 @@ const rclient = getRedis();
|
|
|
10
10
|
export default async function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, }) {
|
|
11
11
|
const pg = pg1 || getPG({ name: "client" });
|
|
12
12
|
// pg client single transaction support
|
|
13
|
-
if (!pg?.pk &&
|
|
14
|
-
pg.options =
|
|
15
|
-
pg.tlist = pgClients.client?.tlist;
|
|
16
|
-
pg.pgType = pgClients.client?.pgType;
|
|
17
|
-
pg.relkinds = pgClients.client?.relkinds;
|
|
18
|
-
pg.pk = pgClients.client?.pk;
|
|
13
|
+
if (pg && !pg?.pk && pg.connectionParameters) {
|
|
14
|
+
pg.options = pg.connectionParameters;
|
|
15
|
+
pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
|
|
16
|
+
pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
|
|
17
|
+
pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
|
|
18
|
+
pg.pk = pgClients[pg.options?.database || "client"]?.pk;
|
|
19
19
|
}
|
|
20
20
|
const table = pg.pk?.[table1] ? table1 : table1.replace(/"/g, "");
|
|
21
21
|
if (!table)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataInsert.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataInsert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,OAAO,EACP,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,EACH,SAAc,GACf,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC,
|
|
1
|
+
{"version":3,"file":"dataInsert.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataInsert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,OAAO,EACP,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,EACH,SAAc,GACf,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC,gBA2JA"}
|
|
@@ -10,15 +10,16 @@ import extraData from "../../extra/extraData.js";
|
|
|
10
10
|
const rclient = getRedis();
|
|
11
11
|
export default async function dataInsert({ id, table: table1, referer, data, pg: pg1, uid, tokenData = {}, }) {
|
|
12
12
|
const pg = pg1 || getPG({ name: "client" });
|
|
13
|
-
if (!pg)
|
|
13
|
+
if (!pg) {
|
|
14
14
|
return null;
|
|
15
|
+
}
|
|
15
16
|
// pg client single transaction support
|
|
16
|
-
if (!pg?.pk &&
|
|
17
|
-
pg.options =
|
|
18
|
-
pg.tlist = pgClients.client?.tlist;
|
|
19
|
-
pg.pgType = pgClients.client?.pgType;
|
|
20
|
-
pg.relkinds = pgClients.client?.relkinds;
|
|
21
|
-
pg.pk = pgClients.client?.pk;
|
|
17
|
+
if (pg && !pg?.pk && pg.connectionParameters) {
|
|
18
|
+
pg.options = pg.connectionParameters;
|
|
19
|
+
pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
|
|
20
|
+
pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
|
|
21
|
+
pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
|
|
22
|
+
pg.pk = pgClients[pg.options?.database || "client"]?.pk;
|
|
22
23
|
}
|
|
23
24
|
const { unittest } = tokenData || {};
|
|
24
25
|
if (config.trace || unittest)
|
|
@@ -31,14 +32,12 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
|
|
|
31
32
|
id,
|
|
32
33
|
uid,
|
|
33
34
|
})) || {};
|
|
34
|
-
if (!insertQuery || !args.length)
|
|
35
|
+
if (!insertQuery || !args.length) {
|
|
35
36
|
return null;
|
|
37
|
+
}
|
|
36
38
|
// for transactions
|
|
37
39
|
const isClient = typeof pg.query === "function" && typeof pg.release === "function";
|
|
38
40
|
const client = (isClient ? pg : await pg.connect());
|
|
39
|
-
if (!isClient) {
|
|
40
|
-
// client.caller = 'dataInsert';
|
|
41
|
-
}
|
|
42
41
|
if (isClient || !client.pk) {
|
|
43
42
|
client.options = pg.options;
|
|
44
43
|
client.tlist = pg.tlist;
|
|
@@ -54,8 +53,9 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
|
|
|
54
53
|
.query(insertQuery, args)
|
|
55
54
|
.then((el) => el || {});
|
|
56
55
|
const id1 = res.rows?.[0]?.[pg.pk?.[table] || ""];
|
|
57
|
-
if (!id1)
|
|
56
|
+
if (!id1) {
|
|
58
57
|
return null;
|
|
58
|
+
}
|
|
59
59
|
await extraData({
|
|
60
60
|
table,
|
|
61
61
|
form: tokenData?.form,
|
|
@@ -109,7 +109,7 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
|
|
|
109
109
|
if (!isClient) {
|
|
110
110
|
await client.query("commit;");
|
|
111
111
|
}
|
|
112
|
-
return { ...res, id: id1, data: res.rows[0] };
|
|
112
|
+
return { ...res, id: id1, data: res.rows[0], ...res.rows[0] };
|
|
113
113
|
}
|
|
114
114
|
catch (err) {
|
|
115
115
|
logger.file("crud/insert", {
|
|
@@ -28,12 +28,12 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
|
|
|
28
28
|
return null;
|
|
29
29
|
}
|
|
30
30
|
// pg client single transaction support
|
|
31
|
-
if (!pg?.pk &&
|
|
32
|
-
pg.options =
|
|
33
|
-
pg.tlist = pgClients.client?.tlist;
|
|
34
|
-
pg.pgType = pgClients.client?.pgType;
|
|
35
|
-
pg.relkinds = pgClients.client?.relkinds;
|
|
36
|
-
pg.pk = pgClients.client?.pk;
|
|
31
|
+
if (pg && !pg?.pk && pg.connectionParameters) {
|
|
32
|
+
pg.options = pg.connectionParameters;
|
|
33
|
+
pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
|
|
34
|
+
pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
|
|
35
|
+
pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
|
|
36
|
+
pg.pk = pgClients[pg.options?.database || "client"]?.pk;
|
|
37
37
|
}
|
|
38
38
|
const { columns, pk } = await getMeta({ pg, table });
|
|
39
39
|
if (!columns) {
|
|
@@ -13,12 +13,12 @@ export default async function dataUpsert({ id, table: table1, referer, data, pg:
|
|
|
13
13
|
if (!pg)
|
|
14
14
|
return null;
|
|
15
15
|
// pg client single transaction support
|
|
16
|
-
if (!pg?.pk &&
|
|
17
|
-
pg.options =
|
|
18
|
-
pg.tlist = pgClients.client?.tlist;
|
|
19
|
-
pg.pgType = pgClients.client?.pgType;
|
|
20
|
-
pg.relkinds = pgClients.client?.relkinds;
|
|
21
|
-
pg.pk = pgClients.client?.pk;
|
|
16
|
+
if (pg && !pg?.pk && pg.connectionParameters) {
|
|
17
|
+
pg.options = pg.connectionParameters;
|
|
18
|
+
pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
|
|
19
|
+
pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
|
|
20
|
+
pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
|
|
21
|
+
pg.pk = pgClients[pg.options?.database || "client"]?.pk;
|
|
22
22
|
}
|
|
23
23
|
if (config.trace)
|
|
24
24
|
console.log("form", tokenData?.form);
|
|
@@ -26,10 +26,12 @@ export declare function editUserCls({ name, alias, description, data, }: {
|
|
|
26
26
|
alias?: string[];
|
|
27
27
|
data: string | Record<string, any>[];
|
|
28
28
|
}, pg?: any): Promise<string>;
|
|
29
|
-
export declare function getUserClsList({ name, search, sql }: {
|
|
29
|
+
export declare function getUserClsList({ name, search, sql, custom, type, }: {
|
|
30
30
|
name?: string;
|
|
31
31
|
search?: string;
|
|
32
32
|
sql?: any;
|
|
33
|
+
custom?: string;
|
|
34
|
+
type?: string;
|
|
33
35
|
}, pg?: any): Promise<any>;
|
|
34
36
|
export declare function getUserCls(name: string, pg?: any): Promise<{
|
|
35
37
|
type: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/usercls/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,YAAY,CAChC,EACE,IAAI,EACJ,WAAW,EACX,KAAK,EACL,KAAK,EACL,GAAG,EACH,IAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL,EACD,EAAE,MAAmB,mBA8EtB;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB,mBAUtE;AAED,wBAAsB,UAAU,CAC9B,EACE,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAkDtB;AAED,wBAAsB,WAAW,CAC/B,EACE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,IAAI,GACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAKtB;AAED,wBAAsB,cAAc,CAClC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/usercls/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,YAAY,CAChC,EACE,IAAI,EACJ,WAAW,EACX,KAAK,EACL,KAAK,EACL,GAAG,EACH,IAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL,EACD,EAAE,MAAmB,mBA8EtB;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB,mBAUtE;AAED,wBAAsB,UAAU,CAC9B,EACE,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAkDtB;AAED,wBAAsB,WAAW,CAC/B,EACE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,IAAI,GACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAKtB;AAED,wBAAsB,cAAc,CAClC,EACE,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,EACN,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,EACD,EAAE,MAAmB,gBA6CtB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB;;;;;UAsBnE;;AAED,wBAAoB"}
|
|
@@ -120,19 +120,27 @@ export async function editUserCls({ name, alias, description, data, }, pg = pgCl
|
|
|
120
120
|
await addUserCls({ name, alias, description, data }, pg);
|
|
121
121
|
return "ok";
|
|
122
122
|
}
|
|
123
|
-
export async function getUserClsList({ name, search, sql }, pg = pgClients.client) {
|
|
123
|
+
export async function getUserClsList({ name, search, sql, custom, type, }, pg = pgClients.client) {
|
|
124
124
|
const args = name ? [name.split(",")] : [search].filter(Boolean);
|
|
125
|
-
const subQuery = search
|
|
125
|
+
const subQuery = search
|
|
126
|
+
? `case when parent<>$1 then name ilike '%'||$1||'%' else true end`
|
|
127
|
+
: "true";
|
|
128
|
+
const typeStr = type ? { cls: "json", select: "sql" }[type] : null;
|
|
126
129
|
const where = (name ? "name=any($1::text[])" : null) ||
|
|
127
130
|
(search
|
|
128
|
-
? `(
|
|
131
|
+
? `( name ilike '%'||$1||'%' or name in (select parent from admin.user_cls where name ilike '%'||$1||'%') )`
|
|
129
132
|
: "1=1");
|
|
130
|
-
const
|
|
131
|
-
from admin.user_cls t where parent is null and ${where}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
133
|
+
const customQuery = `select true as custom, name, type, description, alias, (select count(*) filter(where ${subQuery}) from admin.user_cls where parent=t.name limit 1) as count
|
|
134
|
+
from admin.user_cls t where parent is null and ${where} and ${typeStr ? `type='${typeStr}'` : "true"}`;
|
|
135
|
+
const gitQuery = `select false as custom, name, type, null as description, null as alias, (select count(*) filter(where ${subQuery}) from admin.cls where parent=t.name limit 1) as count
|
|
136
|
+
from admin.cls t where parent is null and ${where.replace(/admin.user_cls/g, "admin.cls")} and ${typeStr ? `type='${typeStr}'` : "true"}`;
|
|
137
|
+
const q = [
|
|
138
|
+
custom !== "0" ? customQuery : null,
|
|
139
|
+
custom !== "1" ? gitQuery : null,
|
|
140
|
+
]
|
|
141
|
+
.filter(Boolean)
|
|
142
|
+
.join(" union all ")
|
|
143
|
+
.concat(" order by name");
|
|
136
144
|
if (sql)
|
|
137
145
|
return q;
|
|
138
146
|
const rows = await pg.query(q, args).then((el) => el.rows || []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/getUserCls.ts"],"names":[],"mappings":"AAKA,wBAA8B,iBAAiB,CAC7C,EAAE,KAAK,EAAE,IAAI,EAAE,EAAqB,EAAE,EAAE,GAAG,EAC3C,KAAK,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"getUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/getUserCls.ts"],"names":[],"mappings":"AAKA,wBAA8B,iBAAiB,CAC7C,EAAE,KAAK,EAAE,IAAI,EAAE,EAAqB,EAAE,EAAE,GAAG,EAC3C,KAAK,EAAE,GAAG,gBAsBX"}
|
|
@@ -6,8 +6,14 @@ export default async function getUserClsListApi({ query, user, pg = pgClients.cl
|
|
|
6
6
|
return reply.status(401).send({ error: "unauthorized", code: 401 });
|
|
7
7
|
}
|
|
8
8
|
const t1 = Date.now();
|
|
9
|
-
const result = await getUserClsList({
|
|
9
|
+
const result = await getUserClsList({
|
|
10
|
+
name: query.name,
|
|
11
|
+
search: query.search,
|
|
12
|
+
type: query.type,
|
|
13
|
+
custom: query.custom,
|
|
14
|
+
sql: query.sql,
|
|
15
|
+
}, pg);
|
|
10
16
|
if (query.sql)
|
|
11
17
|
return result;
|
|
12
|
-
return { time: Date.now() - t1, data: result };
|
|
18
|
+
return { time: Date.now() - t1, filtered: result.length, data: result };
|
|
13
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAM1B,QAAA,IAAI,QAAQ,EAAE,GAAG,CAAC;AASlB,MAAM,WAAW,UAAW,SAAQ,IAAI;IACtC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;CACjE;AAYD,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG;QAC7C,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,OAAO,QAAQ,CAAC;IACnE,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"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"}
|