prostgles-server 4.2.626 → 4.2.627
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/debug/prostgles-types-4.0.285.tgz +0 -0
- package/dist/Audit/getAuditTableRules.js +1 -1
- package/dist/Audit/getAuditTableRules.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.d.ts +3 -1
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js +18 -11
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.js +16 -21
- package/dist/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/utils.d.ts +1 -0
- package/dist/DboBuilder/QueryBuilder/Functions/utils.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/utils.js +3 -1
- package/dist/DboBuilder/QueryBuilder/Functions/utils.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts +18 -2
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +54 -16
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +40 -6
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/parseJoinSelect.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/parseJoinSelect.js +2 -12
- package/dist/DboBuilder/QueryBuilder/parseJoinSelect.js.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js +7 -6
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js +2 -29
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.d.ts +4 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js +9 -2
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js +8 -3
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/validateSelectParams.d.ts +3 -0
- package/dist/DboBuilder/ViewHandler/validateSelectParams.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/validateSelectParams.js +48 -0
- package/dist/DboBuilder/ViewHandler/validateSelectParams.js.map +1 -0
- package/dist/DboBuilder/getCondition.d.ts.map +1 -1
- package/dist/DboBuilder/getCondition.js +9 -3
- package/dist/DboBuilder/getCondition.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +7 -2
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +1 -1
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.js +1 -1
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.js +1 -4
- package/dist/TableConfig/initTableConfig.js.map +1 -1
- package/lib/Audit/getAuditTableRules.ts +1 -1
- package/lib/DboBuilder/QueryBuilder/Functions/Functions.ts +38 -13
- package/lib/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.ts +28 -24
- package/lib/DboBuilder/QueryBuilder/Functions/utils.ts +10 -0
- package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +95 -18
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +58 -10
- package/lib/DboBuilder/QueryBuilder/parseJoinSelect.ts +2 -13
- package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +9 -8
- package/lib/DboBuilder/ViewHandler/find.ts +2 -32
- package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts +10 -2
- package/lib/DboBuilder/ViewHandler/subscribe.ts +10 -3
- package/lib/DboBuilder/ViewHandler/validateSelectParams.ts +51 -0
- package/lib/DboBuilder/getCondition.ts +11 -3
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +10 -3
- package/lib/PubSubManager/PubSubManager.ts +1 -1
- package/lib/PubSubManager/addSub.ts +1 -1
- package/lib/TableConfig/initTableConfig.ts +1 -6
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/QueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/QueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SelectParams } from "prostgles-types";
|
|
2
2
|
import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
3
|
-
import type
|
|
3
|
+
import { type Filter, type LocalParams, type PGIdentifier } from "../DboBuilder";
|
|
4
4
|
import type { ViewHandler } from "../ViewHandler/ViewHandler";
|
|
5
5
|
import type { NewQuery } from "./QueryBuilder";
|
|
6
6
|
export declare const getNewQuery: (viewHandler: ViewHandler, filter: Filter, selectParams: (SelectParams & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAI7D,eAAO,MAAM,WAAW,GACtB,aAAa,WAAW,EACxB,QAAQ,MAAM,EACd,eAAc,YAAY,GAAG;IAAE,mBAAmB,CAAC,EAAE,YAAY,CAAA;CAAE,aAAK,EACxE,YAAY,eAAe,GAAG,SAAS,EACvC,aAAa,WAAW,GAAG,SAAS,KACnC,OAAO,CAAC,QAAQ,CAkNlB,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getNewQuery = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
+
const DboBuilder_1 = require("../DboBuilder");
|
|
5
6
|
const parseJoinPath_1 = require("../ViewHandler/parseJoinPath");
|
|
6
7
|
const prepareSortItems_1 = require("../ViewHandler/prepareSortItems");
|
|
7
8
|
const prepareWhere_1 = require("../ViewHandler/prepareWhere");
|
|
@@ -11,17 +12,24 @@ const QueryBuilder_1 = require("./QueryBuilder");
|
|
|
11
12
|
const getSelectQuery_1 = require("./getSelectQuery");
|
|
12
13
|
const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, localParams) => {
|
|
13
14
|
const { columns } = viewHandler;
|
|
14
|
-
|
|
15
|
+
const selectRule = tableRules?.select;
|
|
16
|
+
if (tableRules && !selectRule?.fields) {
|
|
15
17
|
throw `INTERNAL ERROR: publish.${viewHandler.name}.select.fields rule missing`;
|
|
16
18
|
}
|
|
17
|
-
|
|
19
|
+
/** Only missing tableRules means this is an unrestricted local query */
|
|
20
|
+
const allowedOrderByFields = !selectRule ?
|
|
18
21
|
viewHandler.column_names.slice(0)
|
|
19
|
-
: viewHandler.parseFieldFilter(
|
|
20
|
-
const allowedSelectFields = !
|
|
22
|
+
: viewHandler.parseFieldFilter(selectRule.orderByFields);
|
|
23
|
+
const allowedSelectFields = !selectRule ?
|
|
21
24
|
viewHandler.column_names.slice(0)
|
|
22
|
-
: viewHandler.parseFieldFilter(
|
|
25
|
+
: viewHandler.parseFieldFilter(selectRule.fields);
|
|
26
|
+
const allowedFilterFields = !selectRule ?
|
|
27
|
+
viewHandler.column_names.slice(0)
|
|
28
|
+
: viewHandler.parseFieldFilter(selectRule.filterFields);
|
|
23
29
|
const joinQueries = [];
|
|
24
30
|
const { select: userSelect = "*" } = selectParams;
|
|
31
|
+
const aggregateTableAlias = selectParams.joinExpressionAlias ??
|
|
32
|
+
{ raw: getSelectQuery_1.ROOT_TABLE_ALIAS, escaped: getSelectQuery_1.ROOT_TABLE_ALIAS };
|
|
25
33
|
const selectItemBuilder = new QueryBuilder_1.SelectItemBuilder({
|
|
26
34
|
allowedFields: allowedSelectFields,
|
|
27
35
|
allowedOrderByFields,
|
|
@@ -30,6 +38,30 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
|
|
|
30
38
|
functions: Functions_1.FUNCTIONS,
|
|
31
39
|
allFields: viewHandler.column_names.slice(0),
|
|
32
40
|
columns,
|
|
41
|
+
parseAggregateOptions: async ({ $filter, $orderBy }) => {
|
|
42
|
+
if ($filter !== undefined && !(0, prostgles_types_1.isObject)($filter)) {
|
|
43
|
+
throw `Invalid aggregate $filter. Expecting an object`;
|
|
44
|
+
}
|
|
45
|
+
const filterInfo = $filter === undefined ? undefined : (await (0, prepareWhere_1.prepareWhere)(viewHandler, {
|
|
46
|
+
filter: $filter,
|
|
47
|
+
select: undefined,
|
|
48
|
+
filterFields: allowedFilterFields,
|
|
49
|
+
tableAlias: aggregateTableAlias,
|
|
50
|
+
localParams,
|
|
51
|
+
addWhere: false,
|
|
52
|
+
tableRule: tableRules,
|
|
53
|
+
}));
|
|
54
|
+
const orderByItems = (0, prepareSortItems_1.prepareSortItems)($orderBy, allowedOrderByFields, aggregateTableAlias, [], []);
|
|
55
|
+
return {
|
|
56
|
+
filter: filterInfo?.condition,
|
|
57
|
+
orderBy: (0, DboBuilder_1.prepareOrderByQuery)(orderByItems, aggregateTableAlias.raw)[0],
|
|
58
|
+
dependencyFields: [
|
|
59
|
+
...(filterInfo?.columnsUsed ?? []),
|
|
60
|
+
...orderByItems.map(({ key }) => key),
|
|
61
|
+
],
|
|
62
|
+
dependencyExists: filterInfo?.exists ?? [],
|
|
63
|
+
};
|
|
64
|
+
},
|
|
33
65
|
});
|
|
34
66
|
await selectItemBuilder.parseUserSelectWithJoins(userSelect, async (joinColumnName, parsedJoin) => {
|
|
35
67
|
const j_selectParams = {};
|
|
@@ -110,7 +142,9 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
|
|
|
110
142
|
const havingOpts = (0, prostgles_types_1.isEmpty)(selectParams.having) ? undefined : (await (0, prepareWhere_1.prepareWhere)(viewHandler, {
|
|
111
143
|
...(0, prostgles_types_1.omitKeys)(commonWhereParams, ["forcedFilter", "selectParams"]),
|
|
112
144
|
filter: selectParams.having,
|
|
113
|
-
tableAlias: selectParams.joinExpressionAlias ?
|
|
145
|
+
tableAlias: selectParams.joinExpressionAlias ?
|
|
146
|
+
source.alias
|
|
147
|
+
: { raw: getSelectQuery_1.ROOT_TABLE_ALIAS, escaped: getSelectQuery_1.ROOT_TABLE_ALIAS },
|
|
114
148
|
isHaving: true,
|
|
115
149
|
}));
|
|
116
150
|
const validatedRules = viewHandler.getValidatedRules(tableRules, localParams);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinSelect.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/parseJoinSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAElB,UAAU,EACV,WAAW,EACX,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"parseJoinSelect.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/parseJoinSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAElB,UAAU,EACV,WAAW,EACX,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,kBAAkB,GAAG;QAC3B,KAAK,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;CACH,GACD;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAEjD,eAAO,MAAM,eAAe,GAAI,YAAY,UAAU,KAAG,UAAU,GAAG,MA0CrE,CAAC"}
|
|
@@ -2,16 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseJoinSelect = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const JOIN_KEYS = ["$innerJoin", "$leftJoin"];
|
|
6
|
-
const JOIN_PARAM_KEYS = (0, prostgles_types_1.getKeys)({
|
|
7
|
-
$condition: 1,
|
|
8
|
-
filter: 1,
|
|
9
|
-
having: 1,
|
|
10
|
-
limit: 1,
|
|
11
|
-
offset: 1,
|
|
12
|
-
orderBy: 1,
|
|
13
|
-
select: 1,
|
|
14
|
-
});
|
|
15
5
|
const parseJoinSelect = (joinParams) => {
|
|
16
6
|
if (!joinParams) {
|
|
17
7
|
return "Empty join params";
|
|
@@ -25,13 +15,13 @@ const parseJoinSelect = (joinParams) => {
|
|
|
25
15
|
params: joinParams,
|
|
26
16
|
};
|
|
27
17
|
}
|
|
28
|
-
const [joinKey, ...otherKeys] = (0, prostgles_types_1.getKeys)(joinParams).filter((k) => (0, prostgles_types_1.includes)(JOIN_KEYS, k));
|
|
18
|
+
const [joinKey, ...otherKeys] = (0, prostgles_types_1.getKeys)(joinParams).filter((k) => (0, prostgles_types_1.includes)(prostgles_types_1.JOIN_KEYS, k));
|
|
29
19
|
if (otherKeys.length) {
|
|
30
20
|
return "Cannot specify more than one join type ( $innerJoin OR $leftJoin )";
|
|
31
21
|
}
|
|
32
22
|
else if (joinKey) {
|
|
33
23
|
/* Full option join { field_name: db.innerJoin.table_name(filter, select) } */
|
|
34
|
-
const invalidParams = Object.keys(joinParams).filter((k) => !(0, prostgles_types_1.includes)([...
|
|
24
|
+
const invalidParams = Object.keys(joinParams).filter((k) => !(0, prostgles_types_1.includes)([...prostgles_types_1.JOIN_PARAMS, ...prostgles_types_1.JOIN_KEYS], k));
|
|
35
25
|
if (invalidParams.length) {
|
|
36
26
|
throw "Invalid join params: " + invalidParams.join(", ");
|
|
37
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinSelect.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/parseJoinSelect.ts"],"names":[],"mappings":";;;AAOA,
|
|
1
|
+
{"version":3,"file":"parseJoinSelect.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/parseJoinSelect.ts"],"names":[],"mappings":";;;AAOA,qDAA4E;AAYrE,MAAM,eAAe,GAAG,CAAC,UAAsB,EAAuB,EAAE;IAC7E,IAAI,CAAE,UAAqB,EAAE,CAAC;QAC5B,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAK,UAAqB,KAAK,GAAG,EAAE,CAAC;YACnC,MAAM,sCAAsC,CAAC;QAC/C,CAAC;QACD,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,GAAG,IAAA,yBAAO,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAQ,EAAC,2BAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1F,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QACrB,OAAO,oEAAoE,CAAC;IAC9E,CAAC;SAAM,IAAI,OAAO,EAAE,CAAC;QACnB,gFAAgF;QAChF,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,0BAAQ,EAAC,CAAC,GAAG,6BAAW,EAAE,GAAG,2BAAS,CAAC,EAAE,CAAC,CAAC,CACpD,CAAC;QACF,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAwB,CAAC;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,4CAA4C,OAAO,EAAE,CAAC;QAC9D,CAAC;QACD,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE;gBACN,GAAI,UAAiC;gBACrC,IAAI;gBACJ,KAAK,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK;aAC5D;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,UAA8B;KACvC,CAAC;AACJ,CAAC,CAAC;AA1CW,QAAA,eAAe,mBA0C1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onDeleteFromFileTable.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAMzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,KAAK,yBAAyB,GAAG;IAC/B,cAAc,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;KACnB,CAAC;IACF,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,QAAQ,eAAe,EACvB,+DAA+D,yBAAyB,
|
|
1
|
+
{"version":3,"file":"onDeleteFromFileTable.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAMzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,KAAK,yBAAyB,GAAG;IAC/B,cAAc,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;KACnB,CAAC;IACF,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,QAAQ,eAAe,EACvB,+DAA+D,yBAAyB,qCAyCzF,CAAC"}
|
|
@@ -11,25 +11,26 @@ const onDeleteFromFileTable = async (config, { onCommit, t, dbx, returningQuery,
|
|
|
11
11
|
return (isOneOrNone ? result[0] : result);
|
|
12
12
|
}
|
|
13
13
|
const fileIds = config.versioning ?
|
|
14
|
-
|
|
14
|
+
await (0, fileVersionUtils_1.getFileTableHandler)(dbx, config).find(filterOpts.filter, {
|
|
15
15
|
select: { id: 1 },
|
|
16
16
|
limit: null,
|
|
17
|
-
})
|
|
17
|
+
})
|
|
18
18
|
: [];
|
|
19
19
|
const versionFiles = fileIds.length ?
|
|
20
|
-
|
|
20
|
+
await (0, fileVersionUtils_1.getFileRevisionsTableHandler)(dbx, config).find({ file_id: { $in: fileIds.map(({ id }) => id) } }, { select: { storage_key: 1 }, limit: null })
|
|
21
21
|
: [];
|
|
22
|
+
const KEY = "_prostgles_storage_key";
|
|
22
23
|
const files = await t.any(`DELETE FROM ${(0, prostgles_types_1.asName)(tableName)} ${filterOpts.where}
|
|
23
24
|
${returningQuery ? `${returningQuery},` : "RETURNING"}
|
|
24
|
-
COALESCE(storage_key, id) AS
|
|
25
|
+
COALESCE(storage_key, id) AS ${KEY}`);
|
|
25
26
|
const storageKeys = new Set([
|
|
26
27
|
...versionFiles.map(({ storage_key }) => storage_key),
|
|
27
|
-
...files.map((
|
|
28
|
+
...files.map((row) => row[KEY]),
|
|
28
29
|
]);
|
|
29
30
|
for (const storageKey of storageKeys) {
|
|
30
31
|
onCommit(({ db }) => (0, deleteUnreferencedFile_1.deleteUnreferencedFile)(db, config, storageKey));
|
|
31
32
|
}
|
|
32
|
-
const result = files.map(({
|
|
33
|
+
const result = files.map(({ [KEY]: _, ...row }) => row);
|
|
33
34
|
if (!returningQuery)
|
|
34
35
|
return undefined;
|
|
35
36
|
return (isOneOrNone ? result[0] : result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onDeleteFromFileTable.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":";;;AAEA,qDAAyC;AAGzC,uFAAoF;AACpF,2EAG8C;AAevC,MAAM,qBAAqB,GAAG,KAAK,EACxC,MAAuB,EACvB,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAA6B,EACxF,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC7B,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CACxB,UAAU,IAAA,wBAAM,EAAC,SAAS,CAAC,wBAAwB,UAAU,CAAC,KAAK,IAAI,cAAc,IAAI,EAAE,GAAG,CAC/F,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAA4B,CAAC;IACvE,CAAC;IAED,MAAM,OAAO,GACX,MAAM,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"onDeleteFromFileTable.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":";;;AAEA,qDAAyC;AAGzC,uFAAoF;AACpF,2EAG8C;AAevC,MAAM,qBAAqB,GAAG,KAAK,EACxC,MAAuB,EACvB,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAA6B,EACxF,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC7B,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CACxB,UAAU,IAAA,wBAAM,EAAC,SAAS,CAAC,wBAAwB,UAAU,CAAC,KAAK,IAAI,cAAc,IAAI,EAAE,GAAG,CAC/F,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAA4B,CAAC;IACvE,CAAC;IAED,MAAM,OAAO,GACX,MAAM,CAAC,UAAU,CAAC,CAAC;QACjB,MAAM,IAAA,sCAAmB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC7D,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;YACjB,KAAK,EAAE,IAAI;SACZ,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,IAAA,+CAA4B,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC,IAAI,CAClD,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EACjD,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAC5C;QACH,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,GAAG,GAAG,wBAAiC,CAAC;IAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CACvB,eAAe,IAAA,wBAAM,EAAC,SAAS,CAAC,IAAI,UAAU,CAAC,KAAK;OACjD,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC,WAAW;oCACtB,GAAG,EAAE,CACtC,CAAC;IACF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;QAC1B,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC;QACrD,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAChC,CAAC,CAAC;IACH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IACxD,IAAI,CAAC,cAAc;QAAE,OAAO,SAAS,CAAC;IACtC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAA4B,CAAC;AACvE,CAAC,CAAC;AA3CW,QAAA,qBAAqB,yBA2ChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAWzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,MAAM,GAAG;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,IAAI,GACf,MAAM,WAAW,EACjB,SAAQ,MAAW,EACnB,eAAe,YAAY,EAC3B,SAAS,MAAM,EACf,aAAa,eAAe,EAC5B,cAAc,WAAW,KACxB,OAAO,CAAC,GAAG,EAAE,CA8Hf,CAAC"}
|
|
@@ -6,44 +6,17 @@ const DboBuilder_1 = require("../DboBuilder");
|
|
|
6
6
|
const getNewQuery_1 = require("../QueryBuilder/getNewQuery");
|
|
7
7
|
const getSelectQuery_1 = require("../QueryBuilder/getSelectQuery");
|
|
8
8
|
const getReturnTypeQuery_1 = require("./getReturnTypeQuery");
|
|
9
|
+
const validateSelectParams_1 = require("./validateSelectParams");
|
|
9
10
|
const find = async function (filter = {}, selectParams, param3, tableRules, localParams) {
|
|
10
11
|
const start = Date.now();
|
|
11
12
|
const { limit, returnType, abortSignal } = selectParams ?? {};
|
|
12
13
|
const command = limit === 1 && returnType === "row" ? "findOne" : "find";
|
|
13
14
|
try {
|
|
14
|
-
|
|
15
|
-
row: 1,
|
|
16
|
-
statement: 1,
|
|
17
|
-
value: 1,
|
|
18
|
-
values: 1,
|
|
19
|
-
"statement-no-rls": 1,
|
|
20
|
-
"statement-where": 1,
|
|
21
|
-
});
|
|
15
|
+
(0, validateSelectParams_1.validateSelectParams)(selectParams);
|
|
22
16
|
const { returnType } = selectParams || {};
|
|
23
|
-
if (returnType && !allowedReturnTypes.includes(returnType)) {
|
|
24
|
-
throw `returnType (${returnType}) can only be ${allowedReturnTypes.join(" OR ")}`;
|
|
25
|
-
}
|
|
26
17
|
const { testRule = false } = localParams || {};
|
|
27
18
|
if (testRule)
|
|
28
19
|
return [];
|
|
29
|
-
if (selectParams) {
|
|
30
|
-
const validParamNames = Object.keys({
|
|
31
|
-
select: 1,
|
|
32
|
-
orderBy: 1,
|
|
33
|
-
offset: 1,
|
|
34
|
-
limit: 1,
|
|
35
|
-
returnType: 1,
|
|
36
|
-
groupBy: 1,
|
|
37
|
-
having: 1,
|
|
38
|
-
abortSignal: 1,
|
|
39
|
-
});
|
|
40
|
-
const invalidParams = Object.keys(selectParams).filter((k) => !validParamNames.includes(k));
|
|
41
|
-
if (invalidParams.length)
|
|
42
|
-
throw ("Invalid params: " +
|
|
43
|
-
invalidParams.join(", ") +
|
|
44
|
-
" \n Expecting: " +
|
|
45
|
-
validParamNames.join(", "));
|
|
46
|
-
}
|
|
47
20
|
/* Validate publish */
|
|
48
21
|
if (tableRules) {
|
|
49
22
|
if (!tableRules.select)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAG3C,8CAKuB;AACvB,6DAA0D;AAC1D,mEAAgE;AAChE,6DAA0D;
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@ type Args = {
|
|
|
7
7
|
allowed_colnames: string[];
|
|
8
8
|
columns: TableSchemaColumn[];
|
|
9
9
|
};
|
|
10
|
-
export declare const parseComplexFilter: ({ filter, complexFilterKey, tableAliasRaw, allowed_colnames, columns, }: Args) =>
|
|
10
|
+
export declare const parseComplexFilter: ({ filter, complexFilterKey, tableAliasRaw, allowed_colnames, columns, }: Args) => {
|
|
11
|
+
condition: string;
|
|
12
|
+
columnsUsed: string[];
|
|
13
|
+
};
|
|
11
14
|
export {};
|
|
12
15
|
//# sourceMappingURL=parseComplexFilter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseComplexFilter.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseComplexFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAO5D,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,SAAS,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B,CAAC;AAWF,eAAO,MAAM,kBAAkB,GAAI,yEAMhC,IAAI,
|
|
1
|
+
{"version":3,"file":"parseComplexFilter.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseComplexFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAO5D,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,SAAS,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B,CAAC;AAWF,eAAO,MAAM,kBAAkB,GAAI,yEAMhC,IAAI;;;CAoFN,CAAC"}
|
|
@@ -20,6 +20,7 @@ const allowedComparators = Filtering_1.FILTER_OPERANDS; //[">", "<", "=", "<=",
|
|
|
20
20
|
}
|
|
21
21
|
*/
|
|
22
22
|
const parseComplexFilter = ({ filter, complexFilterKey, tableAliasRaw, allowed_colnames, columns, }) => {
|
|
23
|
+
const columnsUsed = [];
|
|
23
24
|
/**
|
|
24
25
|
* { $funcName: [arg1, arg2] }
|
|
25
26
|
* { $column: "column_name" }
|
|
@@ -31,8 +32,9 @@ const parseComplexFilter = ({ filter, complexFilterKey, tableAliasRaw, allowed_c
|
|
|
31
32
|
throw `expecting: \n { $column: "column_name" } received:\n ${JSON.stringify(funcData)}`;
|
|
32
33
|
}
|
|
33
34
|
if (!allowed_colnames.includes(column)) {
|
|
34
|
-
throw `
|
|
35
|
+
throw `Disallowed or Invalid column ${column}. Allowed columns: ${allowed_colnames}`;
|
|
35
36
|
}
|
|
37
|
+
columnsUsed.push(column);
|
|
36
38
|
return (0, asNameAlias_1.asNameAlias)(column, tableAliasRaw);
|
|
37
39
|
}
|
|
38
40
|
const { funcName, args } = (0, QueryBuilder_1.parseFunctionObject)(funcData);
|
|
@@ -42,6 +44,8 @@ const parseComplexFilter = ({ filter, complexFilterKey, tableAliasRaw, allowed_c
|
|
|
42
44
|
functions: Functions_1.FUNCTIONS,
|
|
43
45
|
allowedFields: allowed_colnames,
|
|
44
46
|
});
|
|
47
|
+
const fields = funcDef.getFields(args);
|
|
48
|
+
columnsUsed.push(...(fields === "*" ? allowed_colnames : fields));
|
|
45
49
|
return funcDef.getQuery({
|
|
46
50
|
args,
|
|
47
51
|
tableAliasRaw,
|
|
@@ -86,7 +90,10 @@ const parseComplexFilter = ({ filter, complexFilterKey, tableAliasRaw, allowed_c
|
|
|
86
90
|
}
|
|
87
91
|
result += ` ${sqlOperand} ${rightVal}`;
|
|
88
92
|
}
|
|
89
|
-
return
|
|
93
|
+
return {
|
|
94
|
+
condition: result,
|
|
95
|
+
columnsUsed: Array.from(new Set(columnsUsed)),
|
|
96
|
+
};
|
|
90
97
|
};
|
|
91
98
|
exports.parseComplexFilter = parseComplexFilter;
|
|
92
99
|
//# sourceMappingURL=parseComplexFilter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseComplexFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseComplexFilter.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAC3C,yDAA2F;AAC3F,mEAAgE;AAChE,+DAAmE;AAEnE,+EAAiE;AACjE,2EAAwE;AACxE,yDAAsD;AACtD,iFAA8E;AAE9E,MAAM,kBAAkB,GAAG,2BAAe,CAAC,CAAC,yCAAyC;AASrF;;;;;;;;EAQE;AACK,MAAM,kBAAkB,GAAG,CAAC,EACjC,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,OAAO,GACF,EAAE,EAAE;IACT;;;OAGG;IACH,MAAM,YAAY,GAAG,CAAC,QAAmB,EAAU,EAAE;QACnD,IAAI,IAAA,0BAAQ,EAAC,QAAQ,CAAC,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;YACnC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,yDAAyD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5F,CAAC;YACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvC,MAAM,
|
|
1
|
+
{"version":3,"file":"parseComplexFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseComplexFilter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAIzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;AAElE,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,GAAG,SAAS,EAC/B,aAAa,MAAM,GAAG,SAAS,wBAGhC,CAAC;AAEF,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAC;AACvC,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAIzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;AAElE,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,GAAG,SAAS,EAC/B,aAAa,MAAM,GAAG,SAAS,wBAGhC,CAAC;AAEF,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAC;AACvC,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAuIjC,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -36,9 +36,14 @@ async function subscribe(filter, params, onData, table_rules, localParams) {
|
|
|
36
36
|
localParams,
|
|
37
37
|
newQuery,
|
|
38
38
|
});
|
|
39
|
-
const [firstField, ...otherFields] =
|
|
40
|
-
.
|
|
41
|
-
|
|
39
|
+
const [firstField, ...otherFields] = Array.from(new Set([
|
|
40
|
+
...newQuery.select
|
|
41
|
+
.filter((s) => s.selected)
|
|
42
|
+
.flatMap((item) => [...item.fields, ...(item.dependencyFields ?? [])]),
|
|
43
|
+
...newQuery.orderByItems
|
|
44
|
+
.map(({ key }) => key)
|
|
45
|
+
.filter((key) => this.column_names.includes(key)),
|
|
46
|
+
]));
|
|
42
47
|
const commonSubOpts = {
|
|
43
48
|
table_info: this.tableOrViewInfo,
|
|
44
49
|
viewOptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateSelectParams.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/validateSelectParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAElG,eAAO,MAAM,oBAAoB,GAC/B,cAAc,GAAG,KAChB,YAAY,IAAI,YAAY,GAAG,SA8CjC,CAAC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateSelectParams = void 0;
|
|
4
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
+
const validateSelectParams = (selectParams) => {
|
|
6
|
+
if (selectParams === undefined) {
|
|
7
|
+
return true;
|
|
8
|
+
}
|
|
9
|
+
const allowedReturnTypes = (0, prostgles_types_1.getKeys)({
|
|
10
|
+
row: 1,
|
|
11
|
+
statement: 1,
|
|
12
|
+
value: 1,
|
|
13
|
+
values: 1,
|
|
14
|
+
"statement-no-rls": 1,
|
|
15
|
+
"statement-where": 1,
|
|
16
|
+
});
|
|
17
|
+
const selectParamsValidation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({
|
|
18
|
+
select: {
|
|
19
|
+
oneOf: [{ enum: ["*", ""] }, { record: { values: "any" } }, "string[]"],
|
|
20
|
+
optional: true,
|
|
21
|
+
},
|
|
22
|
+
orderBy: {
|
|
23
|
+
oneOf: [
|
|
24
|
+
{ record: { values: "any" } },
|
|
25
|
+
{ arrayOf: { record: { values: "any" } } },
|
|
26
|
+
"string[]",
|
|
27
|
+
"string",
|
|
28
|
+
],
|
|
29
|
+
optional: true,
|
|
30
|
+
},
|
|
31
|
+
offset: { type: "integer", optional: true },
|
|
32
|
+
limit: { type: "integer", nullable: true, optional: true },
|
|
33
|
+
returnType: {
|
|
34
|
+
enum: allowedReturnTypes,
|
|
35
|
+
optional: true,
|
|
36
|
+
},
|
|
37
|
+
groupBy: { type: "boolean", optional: true },
|
|
38
|
+
having: { record: { values: "any" }, optional: true },
|
|
39
|
+
abortSignal: { type: "any", optional: true },
|
|
40
|
+
}, selectParams, "selectParams");
|
|
41
|
+
if (selectParamsValidation.error !== undefined) {
|
|
42
|
+
throw `selectParams validation error: ${JSON.stringify(selectParamsValidation.error)}`;
|
|
43
|
+
}
|
|
44
|
+
selectParamsValidation.data;
|
|
45
|
+
return true;
|
|
46
|
+
};
|
|
47
|
+
exports.validateSelectParams = validateSelectParams;
|
|
48
|
+
//# sourceMappingURL=validateSelectParams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateSelectParams.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/validateSelectParams.ts"],"names":[],"mappings":";;;AAAA,qDAAkG;AAE3F,MAAM,oBAAoB,GAAG,CAClC,YAAiB,EACyB,EAAE;IAC5C,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC;QACjC,GAAG,EAAE,CAAC;QACN,SAAS,EAAE,CAAC;QACZ,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,kBAAkB,EAAE,CAAC;QACrB,iBAAiB,EAAE,CAAC;KACqC,CAAC,CAAC;IAE7D,MAAM,sBAAsB,GAAG,IAAA,qDAAmC,EAChE;QACE,MAAM,EAAE;YACN,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAU,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,CAAC;YAChF,QAAQ,EAAE,IAAI;SACf;QACD,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;gBAC7B,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC1C,UAAU;gBACV,QAAQ;aACT;YACD,QAAQ,EAAE,IAAI;SACf;QACD,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC3C,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC1D,UAAU,EAAE;YACV,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,IAAI;SACf;QACD,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;QACrD,WAAW,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC7C,EACD,YAAY,EACZ,cAAc,CACf,CAAC;IACF,IAAI,sBAAsB,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,kCAAkC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;IACzF,CAAC;IACD,sBAAsB,CAAC,IAA2B,CAAC;IACnD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAhDW,QAAA,oBAAoB,wBAgD/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCondition.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGlF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ7D;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IACN,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,CAAC;IAC1C,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GACA,OAAO,CAAC;IAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"getCondition.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGlF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ7D;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IACN,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,CAAC;IAC1C,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GACA,OAAO,CAAC;IAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA4NrF"}
|
|
@@ -20,6 +20,9 @@ async function getCondition(params) {
|
|
|
20
20
|
const { filter: rawFilter, select, allowed_colnames, tableAlias, localParams, tableRules, isHaving, } = params;
|
|
21
21
|
const filter = { ...rawFilter };
|
|
22
22
|
const existsConfigs = (0, getExistsFilters_1.getExistsFilters)(filter, this);
|
|
23
|
+
const dependencyColumns = existsConfigs.flatMap((existsConfig) => existsConfig.isJoined ?
|
|
24
|
+
(existsConfig.parsedPath[0]?.on.flatMap((columnPair) => Object.keys(columnPair)) ?? [])
|
|
25
|
+
: []);
|
|
23
26
|
const functionConditions = [];
|
|
24
27
|
const funcFilter = FILTER_FUNCS.filter((f) => f.name in filter);
|
|
25
28
|
funcFilter.map((f) => {
|
|
@@ -32,6 +35,7 @@ async function getCondition(params) {
|
|
|
32
35
|
if (disallowedCols.length) {
|
|
33
36
|
throw `Invalid/disallowed columns found in function filter: ${disallowedCols}`;
|
|
34
37
|
}
|
|
38
|
+
dependencyColumns.push(...fields);
|
|
35
39
|
functionConditions.push(f.getQuery({
|
|
36
40
|
args: funcArgs,
|
|
37
41
|
allColumns: this.columns,
|
|
@@ -52,6 +56,7 @@ async function getCondition(params) {
|
|
|
52
56
|
if (compCol) {
|
|
53
57
|
if (!p.select)
|
|
54
58
|
throw new Error("Computed column filter requires p.select.fields");
|
|
59
|
+
dependencyColumns.push(...p.select.fields);
|
|
55
60
|
computedColConditions.push(compCol.getQuery({
|
|
56
61
|
tableAliasRaw: tableAlias?.raw,
|
|
57
62
|
allowedFields: p.select.fields,
|
|
@@ -105,14 +110,15 @@ async function getCondition(params) {
|
|
|
105
110
|
const complexFilters = [];
|
|
106
111
|
const complexFilterKey = "$filter";
|
|
107
112
|
if (complexFilterKey in filter) {
|
|
108
|
-
const
|
|
113
|
+
const complexFilter = (0, parseComplexFilter_1.parseComplexFilter)({
|
|
109
114
|
filter,
|
|
110
115
|
complexFilterKey,
|
|
111
116
|
tableAliasRaw: tableAlias?.raw,
|
|
112
117
|
allowed_colnames,
|
|
113
118
|
columns: this.columns,
|
|
114
119
|
});
|
|
115
|
-
complexFilters.push(
|
|
120
|
+
complexFilters.push(complexFilter.condition);
|
|
121
|
+
dependencyColumns.push(...complexFilter.columnsUsed);
|
|
116
122
|
}
|
|
117
123
|
/* Parse join filters
|
|
118
124
|
{ $joinFilter: { $ST_DWithin: [table.col, foreignTable.col, distance] }
|
|
@@ -166,7 +172,7 @@ async function getCondition(params) {
|
|
|
166
172
|
templates = templates.concat(complexFilters);
|
|
167
173
|
/* sorted to ensure duplicate subscription channels are not created due to different condition order */
|
|
168
174
|
return {
|
|
169
|
-
columnsUsed: q?.columnsUsed ?? [],
|
|
175
|
+
columnsUsed: Array.from(new Set([...(q?.columnsUsed ?? []), ...dependencyColumns])),
|
|
170
176
|
exists: existsConfigs,
|
|
171
177
|
condition: templates.sort().join(" AND \n"),
|
|
172
178
|
};
|