prostgles-server 4.1.110 → 4.1.112
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/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.js +0 -1
- package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.js +3 -31
- package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
- package/dist/PublishParser/getFileTableRules.d.ts.map +1 -1
- package/dist/PublishParser/getFileTableRules.js +48 -44
- package/dist/PublishParser/getFileTableRules.js.map +1 -1
- package/lib/DboBuilder/TableHandler/TableHandler.ts +0 -1
- package/lib/DboBuilder/ViewHandler/getInfo.ts +3 -30
- package/lib/PublishParser/getFileTableRules.ts +50 -47
- package/package.json +2 -2
- package/tests/client/package-lock.json +15 -15
- package/tests/client/package.json +1 -1
- package/tests/server/index.ts +9 -1
- package/tests/server/package-lock.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAU,YAAY,EAAE,WAAW,EAAW,YAAY,EAAY,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtI,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAc,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3G,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAY,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAqB,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAMpE,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAA;AAED,qBAAa,YAAa,SAAQ,WAAW;gBAE/B,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE;QAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAC,EAAE,SAAS,CAAC,EAAE,SAAS;IASnJ,YAAY,gBAAiB,WAAW,GAAG,SAAS,+BAEnD;IACD,WAAW,gBAAiB,WAAW,GAAG,SAAS,mBAElD;IAGD,gBAAgB;;;;;;;;OAA+B;IAE/C,MAAM,mLAAqB;IAC3B,WAAW,iKAA0B;IAErC,eAAe,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,SAAiB,EAAE,EAAE,eAAe;;;;IA2B5F,MAAM,CACV,SAAS,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,YAAY,EAC3D,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,YAAY,CAAC,EAAE,WAAW,GAC5E,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IAIjC,gBAAgB,cAAqB,MAAM,GAAG,SAAS,iBAAiB,MAAM,EAAE,KAAG,QAAQ,UAAU,EAAE,CAAC,CAkBvG;IAED,eAAe,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE;IAK9B,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjJ,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW;IAIpH,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IA4BnI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW;;;;;
|
|
1
|
+
{"version":3,"file":"TableHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAU,YAAY,EAAE,WAAW,EAAW,YAAY,EAAY,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtI,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAc,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3G,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAY,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAqB,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAMpE,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAA;AAED,qBAAa,YAAa,SAAQ,WAAW;gBAE/B,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE;QAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAC,EAAE,SAAS,CAAC,EAAE,SAAS;IASnJ,YAAY,gBAAiB,WAAW,GAAG,SAAS,+BAEnD;IACD,WAAW,gBAAiB,WAAW,GAAG,SAAS,mBAElD;IAGD,gBAAgB;;;;;;;;OAA+B;IAE/C,MAAM,mLAAqB;IAC3B,WAAW,iKAA0B;IAErC,eAAe,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,SAAiB,EAAE,EAAE,eAAe;;;;IA2B5F,MAAM,CACV,SAAS,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,YAAY,EAC3D,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,YAAY,CAAC,EAAE,WAAW,GAC5E,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IAIjC,gBAAgB,cAAqB,MAAM,GAAG,SAAS,iBAAiB,MAAM,EAAE,KAAG,QAAQ,UAAU,EAAE,CAAC,CAkBvG;IAED,eAAe,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE;IAK9B,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjJ,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW;IAIpH,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IA4BnI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW;;;;;CAkGxI;AAED,eAAO,MAAM,kBAAkB,UAAW,UAAU,EAAE,WAAuE,CAAA"}
|
|
@@ -150,7 +150,6 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
150
150
|
.then(async (_isValid) => {
|
|
151
151
|
const { filterFields, forcedFilter } = table_rules?.select || {};
|
|
152
152
|
const condition = (await this.prepareWhere({ filter, forcedFilter, filterFields, addWhere: false, localParams, tableRule: table_rules })).where;
|
|
153
|
-
// let final_filter = getFindFilter(filter, table_rules);
|
|
154
153
|
const pubSubManager = await this.dboBuilder.getPubSubManager();
|
|
155
154
|
return pubSubManager.addSync({
|
|
156
155
|
table_info: this.tableOrViewInfo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TableHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,KAAK,EAClB,MAAM,sBAAsB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAsB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"getInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,KAAK,EAClB,MAAM,sBAAsB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAsB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,CAqB7J"}
|
|
@@ -6,36 +6,7 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
|
|
|
6
6
|
const p = this.getValidatedRules(tableRules, localParams);
|
|
7
7
|
if (!p.getInfo)
|
|
8
8
|
throw "Not allowed";
|
|
9
|
-
|
|
10
|
-
const mediaTable = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
|
|
11
|
-
if (!this.is_media && mediaTable) {
|
|
12
|
-
const joinConf = this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name];
|
|
13
|
-
if (joinConf) {
|
|
14
|
-
has_media = typeof joinConf === "string" ? joinConf : "one";
|
|
15
|
-
}
|
|
16
|
-
else {
|
|
17
|
-
const jp = this.dboBuilder.getShortestJoinPath(this, mediaTable);
|
|
18
|
-
if (jp && jp.path.length <= 3) {
|
|
19
|
-
if (jp.path.length <= 2) {
|
|
20
|
-
has_media = "one";
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
await Promise.all(jp.path.map(async (tableName) => {
|
|
24
|
-
const pkeyFcols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c.is_pkey).map(c => c.name);
|
|
25
|
-
const cols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c?.references?.some(({ ftable }) => jp.path.includes(ftable)));
|
|
26
|
-
if (cols && cols.length && has_media !== "many") {
|
|
27
|
-
if (cols.some(c => !pkeyFcols?.includes(c.name))) {
|
|
28
|
-
has_media = "many";
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
has_media = "one";
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}));
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}
|
|
9
|
+
const fileTableName = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
|
|
39
10
|
return {
|
|
40
11
|
oid: this.tableOrViewInfo.oid,
|
|
41
12
|
comment: this.tableOrViewInfo.comment,
|
|
@@ -44,7 +15,8 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
|
|
|
44
15
|
allowedNestedInserts: tableRules?.insert?.allowedNestedInserts
|
|
45
16
|
},
|
|
46
17
|
isView: this.is_view,
|
|
47
|
-
|
|
18
|
+
hasFiles: Boolean(!this.is_media && fileTableName && this.columns.some(c => c.references?.some(r => r.ftable === fileTableName))),
|
|
19
|
+
fileTableName,
|
|
48
20
|
dynamicRules: {
|
|
49
21
|
update: Boolean(tableRules?.update?.dynamicFields?.length)
|
|
50
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;;AAOO,KAAK,UAAU,OAAO,CAAoB,IAAa,EAAE,MAAY,EAAE,MAAY,EAAE,UAAsB,EAAE,WAAyB;IAC3I,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,CAAC,CAAC,OAAO;QAAE,MAAM,aAAa,CAAC;IAEpC,
|
|
1
|
+
{"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;;AAOO,KAAK,UAAU,OAAO,CAAoB,IAAa,EAAE,MAAY,EAAE,MAAY,EAAE,UAAsB,EAAE,WAAyB;IAC3I,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,CAAC,CAAC,OAAO;QAAE,MAAM,aAAa,CAAC;IAEpC,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC;IAE5E,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;QAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;QACrC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,iBAAiB,EAAE,YAAY,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAChG,WAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAA,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACvC,oBAAoB,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB;SAC/D;QACD,MAAM,EAAE,IAAI,CAAC,OAAO;QACpB,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC;QACjI,aAAa;QACb,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;SAC3D;KACF,CAAA;AACH,CAAC;AArBD,0BAqBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableRules.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getFileTableRules.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAc,MAAM,wBAAwB,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAE,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,kBAAkB,GAAG,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS;;;eAIjK,MAAM;gBAAU,MAAM;;GAuG5D"}
|
|
@@ -12,61 +12,65 @@ const parseFieldFilter_1 = require("../DboBuilder/ViewHandler/parseFieldFilter")
|
|
|
12
12
|
* Delete on a referenced column table allows deleting any referenced file
|
|
13
13
|
*/
|
|
14
14
|
async function getFileTableRules(fileTableName, fileTablePublishRules, localParams, clientInfo) {
|
|
15
|
-
const opts = this.prostgles.opts;
|
|
16
15
|
const forcedDeleteFilters = [];
|
|
17
16
|
const forcedSelectFilters = [];
|
|
18
17
|
const forcedUpdateFilters = [];
|
|
19
18
|
const allowedNestedInserts = [];
|
|
20
|
-
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
19
|
+
const referencedColumns = this.prostgles.dboBuilder.tablesOrViews?.filter(t => !t.is_view && t.name !== fileTableName).map(t => {
|
|
20
|
+
const refCols = t.columns.filter(c => c.references?.some(r => r.ftable === fileTableName));
|
|
21
|
+
if (!refCols.length)
|
|
22
|
+
return undefined;
|
|
23
|
+
return {
|
|
24
|
+
tableName: t.name,
|
|
25
|
+
columns: refCols.map(c => c.name),
|
|
26
|
+
};
|
|
27
|
+
}).filter(prostgles_types_1.isDefined);
|
|
28
|
+
if (referencedColumns?.length) {
|
|
29
|
+
for await (const { tableName, columns } of referencedColumns) {
|
|
30
|
+
const table_rules = await this.getTableRules({ localParams, tableName }, clientInfo);
|
|
31
|
+
if (table_rules) {
|
|
32
|
+
columns.map(column => {
|
|
33
|
+
const path = [{ table: tableName, on: [{ id: column }] }];
|
|
34
|
+
if (table_rules.delete) {
|
|
35
|
+
forcedDeleteFilters.push({
|
|
36
|
+
$existsJoined: {
|
|
37
|
+
path,
|
|
38
|
+
filter: table_rules.delete.forcedFilter ?? {},
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
if (table_rules.select) {
|
|
43
|
+
const parsedFields = (0, parseFieldFilter_1.parseFieldFilter)(table_rules.select.fields, false, [column]);
|
|
44
|
+
/** Must be allowed to view this column */
|
|
45
|
+
if (parsedFields.includes(column)) {
|
|
46
|
+
forcedSelectFilters.push({
|
|
31
47
|
$existsJoined: {
|
|
32
48
|
path,
|
|
33
|
-
filter: table_rules.
|
|
49
|
+
filter: table_rules.select.forcedFilter ?? {},
|
|
34
50
|
}
|
|
35
51
|
});
|
|
36
52
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
path,
|
|
44
|
-
filter: table_rules.select.forcedFilter ?? {},
|
|
45
|
-
}
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
if (table_rules.insert) {
|
|
50
|
-
const parsedFields = (0, parseFieldFilter_1.parseFieldFilter)(table_rules.insert.fields, false, [column]);
|
|
51
|
-
/** Must be allowed to view this column */
|
|
52
|
-
if (parsedFields.includes(column)) {
|
|
53
|
-
allowedNestedInserts.push({ table: tableName, column });
|
|
54
|
-
}
|
|
53
|
+
}
|
|
54
|
+
if (table_rules.insert) {
|
|
55
|
+
const parsedFields = (0, parseFieldFilter_1.parseFieldFilter)(table_rules.insert.fields, false, [column]);
|
|
56
|
+
/** Must be allowed to view this column */
|
|
57
|
+
if (parsedFields.includes(column)) {
|
|
58
|
+
allowedNestedInserts.push({ table: tableName, column });
|
|
55
59
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
60
|
+
}
|
|
61
|
+
if (table_rules.update) {
|
|
62
|
+
const parsedFields = (0, parseFieldFilter_1.parseFieldFilter)(table_rules.update.fields, false, [column]);
|
|
63
|
+
/** Must be allowed to view this column */
|
|
64
|
+
if (parsedFields.includes(column)) {
|
|
65
|
+
forcedUpdateFilters.push({
|
|
66
|
+
$existsJoined: {
|
|
67
|
+
path,
|
|
68
|
+
filter: table_rules.update.forcedFilter ?? {},
|
|
69
|
+
}
|
|
70
|
+
});
|
|
67
71
|
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
72
|
+
}
|
|
73
|
+
});
|
|
70
74
|
}
|
|
71
75
|
}
|
|
72
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableRules.js","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getFileTableRules.js","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -193,7 +193,6 @@ export class TableHandler extends ViewHandler {
|
|
|
193
193
|
const { filterFields, forcedFilter } = table_rules?.select || {};
|
|
194
194
|
const condition = (await this.prepareWhere({ filter, forcedFilter, filterFields, addWhere: false, localParams, tableRule: table_rules })).where;
|
|
195
195
|
|
|
196
|
-
// let final_filter = getFindFilter(filter, table_rules);
|
|
197
196
|
const pubSubManager = await this.dboBuilder.getPubSubManager();
|
|
198
197
|
return pubSubManager.addSync({
|
|
199
198
|
table_info: this.tableOrViewInfo,
|
|
@@ -10,35 +10,7 @@ export async function getInfo(this: ViewHandler, lang?: string, param2?: any, pa
|
|
|
10
10
|
const p = this.getValidatedRules(tableRules, localParams);
|
|
11
11
|
if (!p.getInfo) throw "Not allowed";
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const mediaTable = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
|
|
16
|
-
|
|
17
|
-
if (!this.is_media && mediaTable) {
|
|
18
|
-
const joinConf = this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name]
|
|
19
|
-
if (joinConf) {
|
|
20
|
-
has_media = typeof joinConf === "string" ? joinConf : "one";
|
|
21
|
-
} else {
|
|
22
|
-
const jp = this.dboBuilder.getShortestJoinPath(this, mediaTable);
|
|
23
|
-
if (jp && jp.path.length <= 3) {
|
|
24
|
-
if (jp.path.length <= 2) {
|
|
25
|
-
has_media = "one"
|
|
26
|
-
} else {
|
|
27
|
-
await Promise.all(jp.path.map(async tableName => {
|
|
28
|
-
const pkeyFcols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c.is_pkey).map(c => c.name);
|
|
29
|
-
const cols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c?.references?.some(({ ftable }) => jp.path.includes(ftable)));
|
|
30
|
-
if (cols && cols.length && has_media !== "many") {
|
|
31
|
-
if (cols.some(c => !pkeyFcols?.includes(c.name))) {
|
|
32
|
-
has_media = "many"
|
|
33
|
-
} else {
|
|
34
|
-
has_media = "one"
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
}));
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
}
|
|
13
|
+
const fileTableName = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
|
|
42
14
|
|
|
43
15
|
return {
|
|
44
16
|
oid: this.tableOrViewInfo.oid,
|
|
@@ -48,7 +20,8 @@ export async function getInfo(this: ViewHandler, lang?: string, param2?: any, pa
|
|
|
48
20
|
allowedNestedInserts: tableRules?.insert?.allowedNestedInserts
|
|
49
21
|
},
|
|
50
22
|
isView: this.is_view,
|
|
51
|
-
|
|
23
|
+
hasFiles: Boolean(!this.is_media && fileTableName && this.columns.some(c => c.references?.some(r => r.ftable === fileTableName))),
|
|
24
|
+
fileTableName,
|
|
52
25
|
dynamicRules: {
|
|
53
26
|
update: Boolean(tableRules?.update?.dynamicFields?.length)
|
|
54
27
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { AnyObject, FullFilter,
|
|
1
|
+
import { AnyObject, FullFilter, isDefined } from "prostgles-types";
|
|
2
2
|
import { AuthResult } from "../AuthHandler";
|
|
3
3
|
import { LocalParams } from "../DboBuilder";
|
|
4
|
-
import { PublishParser } from "./PublishParser";
|
|
5
4
|
import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
|
|
5
|
+
import { PublishParser } from "./PublishParser";
|
|
6
6
|
import { ParsedPublishTable, UpdateRule } from "./publishTypesAndUtils";
|
|
7
7
|
|
|
8
8
|
/**
|
|
@@ -14,61 +14,64 @@ import { ParsedPublishTable, UpdateRule } from "./publishTypesAndUtils";
|
|
|
14
14
|
* Delete on a referenced column table allows deleting any referenced file
|
|
15
15
|
*/
|
|
16
16
|
export async function getFileTableRules (this: PublishParser, fileTableName: string, fileTablePublishRules: ParsedPublishTable | undefined, localParams: LocalParams, clientInfo: AuthResult | undefined) {
|
|
17
|
-
const opts = this.prostgles.opts;
|
|
18
17
|
const forcedDeleteFilters: FullFilter<AnyObject, void>[] = [];
|
|
19
18
|
const forcedSelectFilters: FullFilter<AnyObject, void>[] = [];
|
|
20
19
|
const forcedUpdateFilters: FullFilter<AnyObject, void>[] = [];
|
|
21
20
|
const allowedNestedInserts: { table: string; column: string }[] = [];
|
|
22
|
-
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
21
|
+
const referencedColumns = this.prostgles.dboBuilder.tablesOrViews?.filter(t => !t.is_view && t.name !== fileTableName).map(t => {
|
|
22
|
+
const refCols = t.columns.filter(c => c.references?.some(r => r.ftable === fileTableName));
|
|
23
|
+
if(!refCols.length) return undefined;
|
|
24
|
+
return {
|
|
25
|
+
tableName: t.name,
|
|
26
|
+
columns: refCols.map(c => c.name),
|
|
27
|
+
}
|
|
28
|
+
}).filter(isDefined)
|
|
29
|
+
if(referencedColumns?.length){
|
|
30
|
+
for await (const { tableName, columns } of referencedColumns){
|
|
31
|
+
const table_rules = await this.getTableRules({ localParams, tableName }, clientInfo);
|
|
32
|
+
if(table_rules){
|
|
33
|
+
columns.map(column => {
|
|
34
|
+
const path = [{ table: tableName, on: [{ id: column }] }];
|
|
35
|
+
if(table_rules.delete){
|
|
36
|
+
forcedDeleteFilters.push({
|
|
37
|
+
$existsJoined: {
|
|
38
|
+
path,
|
|
39
|
+
filter: table_rules.delete.forcedFilter ?? {},
|
|
40
|
+
}
|
|
41
|
+
})
|
|
42
|
+
}
|
|
43
|
+
if(table_rules.select){
|
|
44
|
+
const parsedFields = parseFieldFilter(table_rules.select.fields, false, [column]);
|
|
45
|
+
/** Must be allowed to view this column */
|
|
46
|
+
if(parsedFields.includes(column as any)){
|
|
47
|
+
forcedSelectFilters.push({
|
|
33
48
|
$existsJoined: {
|
|
34
49
|
path,
|
|
35
|
-
filter: table_rules.
|
|
50
|
+
filter: table_rules.select.forcedFilter ?? {},
|
|
36
51
|
}
|
|
37
|
-
})
|
|
52
|
+
});
|
|
38
53
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
path,
|
|
46
|
-
filter: table_rules.select.forcedFilter ?? {},
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
}
|
|
54
|
+
}
|
|
55
|
+
if(table_rules.insert){
|
|
56
|
+
const parsedFields = parseFieldFilter(table_rules.insert.fields, false, [column]);
|
|
57
|
+
/** Must be allowed to view this column */
|
|
58
|
+
if(parsedFields.includes(column as any)){
|
|
59
|
+
allowedNestedInserts.push({ table: tableName, column });
|
|
50
60
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
forcedUpdateFilters.push({
|
|
63
|
-
$existsJoined: {
|
|
64
|
-
path,
|
|
65
|
-
filter: table_rules.update.forcedFilter ?? {},
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
}
|
|
61
|
+
}
|
|
62
|
+
if(table_rules.update){
|
|
63
|
+
const parsedFields = parseFieldFilter(table_rules.update.fields, false, [column]);
|
|
64
|
+
/** Must be allowed to view this column */
|
|
65
|
+
if(parsedFields.includes(column as any)){
|
|
66
|
+
forcedUpdateFilters.push({
|
|
67
|
+
$existsJoined: {
|
|
68
|
+
path,
|
|
69
|
+
filter: table_rules.update.forcedFilter ?? {},
|
|
70
|
+
}
|
|
71
|
+
});
|
|
69
72
|
}
|
|
70
|
-
}
|
|
71
|
-
}
|
|
73
|
+
}
|
|
74
|
+
})
|
|
72
75
|
}
|
|
73
76
|
}
|
|
74
77
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.112",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"check-disk-space": "^3.3.1",
|
|
42
42
|
"file-type": "^18.5.0",
|
|
43
43
|
"pg-promise": "^11.3.0",
|
|
44
|
-
"prostgles-types": "^4.0.
|
|
44
|
+
"prostgles-types": "^4.0.49"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/bluebird": "^3.5.36",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"license": "ISC",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@types/node": "^14.14.16",
|
|
13
|
-
"prostgles-client": "^4.0.
|
|
13
|
+
"prostgles-client": "^4.0.34",
|
|
14
14
|
"socket.io-client": "^4.7.1"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
@@ -74,11 +74,11 @@
|
|
|
74
74
|
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
|
75
75
|
},
|
|
76
76
|
"node_modules/prostgles-client": {
|
|
77
|
-
"version": "4.0.
|
|
78
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.
|
|
79
|
-
"integrity": "sha512-
|
|
77
|
+
"version": "4.0.34",
|
|
78
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.34.tgz",
|
|
79
|
+
"integrity": "sha512-aTEMeOnWl2Onbvt9V9Qntmmrvg9HBYRdbR3+7ooc+o4OxrZpoz77Yh/S/47UfUrEyuO4tZ7j83a/MZ0fSDQ0gw==",
|
|
80
80
|
"dependencies": {
|
|
81
|
-
"prostgles-types": "^4.0.
|
|
81
|
+
"prostgles-types": "^4.0.49"
|
|
82
82
|
},
|
|
83
83
|
"peerDependencies": {
|
|
84
84
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
|
|
@@ -90,9 +90,9 @@
|
|
|
90
90
|
}
|
|
91
91
|
},
|
|
92
92
|
"node_modules/prostgles-types": {
|
|
93
|
-
"version": "4.0.
|
|
94
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.
|
|
95
|
-
"integrity": "sha512-
|
|
93
|
+
"version": "4.0.49",
|
|
94
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.49.tgz",
|
|
95
|
+
"integrity": "sha512-UQuYqwy9SgWWCuPFrxVg8+uznhu2RioEKFMmzVdrdBsv4b/SzI9iOAztsVdTfWF2+kviSMofr40mB8bksNGhrw==",
|
|
96
96
|
"dependencies": {
|
|
97
97
|
"json-schema": "^0.4.0"
|
|
98
98
|
}
|
|
@@ -212,17 +212,17 @@
|
|
|
212
212
|
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
|
213
213
|
},
|
|
214
214
|
"prostgles-client": {
|
|
215
|
-
"version": "4.0.
|
|
216
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.
|
|
217
|
-
"integrity": "sha512-
|
|
215
|
+
"version": "4.0.34",
|
|
216
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.34.tgz",
|
|
217
|
+
"integrity": "sha512-aTEMeOnWl2Onbvt9V9Qntmmrvg9HBYRdbR3+7ooc+o4OxrZpoz77Yh/S/47UfUrEyuO4tZ7j83a/MZ0fSDQ0gw==",
|
|
218
218
|
"requires": {
|
|
219
|
-
"prostgles-types": "^4.0.
|
|
219
|
+
"prostgles-types": "^4.0.49"
|
|
220
220
|
}
|
|
221
221
|
},
|
|
222
222
|
"prostgles-types": {
|
|
223
|
-
"version": "4.0.
|
|
224
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.
|
|
225
|
-
"integrity": "sha512-
|
|
223
|
+
"version": "4.0.49",
|
|
224
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.49.tgz",
|
|
225
|
+
"integrity": "sha512-UQuYqwy9SgWWCuPFrxVg8+uznhu2RioEKFMmzVdrdBsv4b/SzI9iOAztsVdTfWF2+kviSMofr40mB8bksNGhrw==",
|
|
226
226
|
"requires": {
|
|
227
227
|
"json-schema": "^0.4.0"
|
|
228
228
|
}
|
package/tests/server/index.ts
CHANGED
|
@@ -75,6 +75,7 @@ function dd(){
|
|
|
75
75
|
dbo.tbl.find;
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
+
|
|
78
79
|
(async () => {
|
|
79
80
|
|
|
80
81
|
|
|
@@ -116,7 +117,7 @@ function dd(){
|
|
|
116
117
|
|
|
117
118
|
onSocketConnect: ({ socket, db }) => {
|
|
118
119
|
if(clientTest){
|
|
119
|
-
log("Client connected -> console does not work. use log function");
|
|
120
|
+
log("Client connected -> console does not work. use log function. socket.id:", socket.id);
|
|
120
121
|
socket.emit("start-test", { server_id: Math.random() });
|
|
121
122
|
socket.on("stop-test", async (err, cb) => {
|
|
122
123
|
cb();
|
|
@@ -126,6 +127,13 @@ function dd(){
|
|
|
126
127
|
}
|
|
127
128
|
|
|
128
129
|
},
|
|
130
|
+
|
|
131
|
+
onSocketDisconnect: ({ socket, db }) => {
|
|
132
|
+
if(clientTest){
|
|
133
|
+
log("Client disconnected. socket.id:", socket.id);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
},
|
|
129
137
|
|
|
130
138
|
publishRawSQL: async (params) => {
|
|
131
139
|
return true;// Boolean(user && user.type === "admin")
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"../..": {
|
|
23
23
|
"name": "prostgles-server",
|
|
24
|
-
"version": "4.1.
|
|
24
|
+
"version": "4.1.111",
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@types/express": "^4.17.13",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"check-disk-space": "^3.3.1",
|
|
31
31
|
"file-type": "^18.5.0",
|
|
32
32
|
"pg-promise": "^11.3.0",
|
|
33
|
-
"prostgles-types": "^4.0.
|
|
33
|
+
"prostgles-types": "^4.0.49"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/bluebird": "^3.5.36",
|
|
@@ -1523,7 +1523,7 @@
|
|
|
1523
1523
|
"eslint": "^8.51.0",
|
|
1524
1524
|
"file-type": "^18.5.0",
|
|
1525
1525
|
"pg-promise": "^11.3.0",
|
|
1526
|
-
"prostgles-types": "^4.0.
|
|
1526
|
+
"prostgles-types": "^4.0.49",
|
|
1527
1527
|
"typescript": "^5.2.2"
|
|
1528
1528
|
}
|
|
1529
1529
|
},
|