prostgles-server 4.2.674 → 4.2.676
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/Audit/getAuditTableRules.d.ts.map +1 -1
- package/dist/Audit/getAuditTableRules.js +31 -4
- package/dist/Audit/getAuditTableRules.js.map +1 -1
- package/dist/Auth/AuthHandler.d.ts +3 -2
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +21 -17
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +6 -6
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/SocketSessionCache.d.ts +12 -0
- package/dist/Auth/SocketSessionCache.d.ts.map +1 -0
- package/dist/Auth/SocketSessionCache.js +89 -0
- package/dist/Auth/SocketSessionCache.js.map +1 -0
- package/dist/Auth/utils/handleGetUser.d.ts +0 -1
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js +0 -37
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts +4 -9
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getComputedJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getComputedJoinQuery.js +5 -5
- package/dist/DboBuilder/QueryBuilder/getComputedJoinQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +3 -3
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +6 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getQuerySource.d.ts +6 -1
- package/dist/DboBuilder/QueryBuilder/getQuerySource.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getQuerySource.js +3 -2
- package/dist/DboBuilder/QueryBuilder/getQuerySource.js.map +1 -1
- package/dist/DboBuilder/TableRules/getValidatedTableRules.d.ts.map +1 -1
- package/dist/DboBuilder/TableRules/getValidatedTableRules.js +1 -0
- package/dist/DboBuilder/TableRules/getValidatedTableRules.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts +8 -0
- package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js +19 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsFilters.js +5 -4
- package/dist/DboBuilder/ViewHandler/getExistsFilters.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js +8 -10
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts +6 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js +29 -2
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareWhere.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareWhere.js +4 -0
- package/dist/DboBuilder/ViewHandler/prepareWhere.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js +3 -3
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/DboBuilder/getColumns.js +2 -2
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/DboBuilder/getCondition.d.ts.map +1 -1
- package/dist/DboBuilder/getCondition.js +1 -1
- package/dist/DboBuilder/getCondition.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts +1 -0
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +31 -4
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/dist/ProstglesContext.spec.js +5 -0
- package/dist/ProstglesContext.spec.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +2 -0
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +4 -0
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getFileTableRules.d.ts.map +1 -1
- package/dist/PublishParser/getFileTableRules.js +24 -6
- package/dist/PublishParser/getFileTableRules.js.map +1 -1
- package/dist/PublishParser/getFileVersionTableRules.d.ts.map +1 -1
- package/dist/PublishParser/getFileVersionTableRules.js +27 -28
- package/dist/PublishParser/getFileVersionTableRules.js.map +1 -1
- package/dist/PublishParser/getParsedPublishTable.d.ts.map +1 -1
- package/dist/PublishParser/getParsedPublishTable.js +6 -1
- package/dist/PublishParser/getParsedPublishTable.js.map +1 -1
- package/dist/PublishParser/getSelectRulePushdown.d.ts +11 -0
- package/dist/PublishParser/getSelectRulePushdown.d.ts.map +1 -0
- package/dist/PublishParser/getSelectRulePushdown.js +86 -0
- package/dist/PublishParser/getSelectRulePushdown.js.map +1 -0
- package/dist/PublishParser/mergeSelectRules.d.ts +18 -0
- package/dist/PublishParser/mergeSelectRules.d.ts.map +1 -0
- package/dist/PublishParser/mergeSelectRules.js +101 -0
- package/dist/PublishParser/mergeSelectRules.js.map +1 -0
- package/dist/PublishParser/publishTypesAndUtils.d.ts +9 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js +9 -4
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.d.ts.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.js +3 -2
- package/dist/WebsocketAPI/onSocketConnected.js.map +1 -1
- package/dist/initProstgles.js +1 -1
- package/dist/initProstgles.js.map +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,EACV,SAAS,IAAI,KAAK,EAClB,QAAQ,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilderTypes.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;
|
|
1
|
+
{"version":3,"file":"DboBuilderTypes.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AA8GtB,QAAA,GAAG,GAAQ,IAAA,oBAAS,EAAC,EAAE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getComputedJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getComputedJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI7D,OAAO,EAAuB,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAE9E,eAAO,MAAM,oBAAoB,GAAI,QAAQ,QAAQ,EAAE,OAAO,YAAY,KAAG,
|
|
1
|
+
{"version":3,"file":"getComputedJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getComputedJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI7D,OAAO,EAAuB,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAE9E,eAAO,MAAM,oBAAoB,GAAI,QAAQ,QAAQ,EAAE,OAAO,YAAY,KAAG,kBA+F5E,CAAC"}
|
|
@@ -21,7 +21,7 @@ const getComputedJoinQuery = (parent, child) => {
|
|
|
21
21
|
return {
|
|
22
22
|
...path,
|
|
23
23
|
alias: isLast ? alias : (0, getTableJoinQuery_1.getTableJoinAlias)(path.table, index),
|
|
24
|
-
|
|
24
|
+
source: isLast ? child.source : path.source,
|
|
25
25
|
};
|
|
26
26
|
});
|
|
27
27
|
const conditions = pathTables.map((path, index) => (0, getTableJoinQuery_1.getJoinOnCondition)({
|
|
@@ -30,8 +30,8 @@ const getComputedJoinQuery = (parent, child) => {
|
|
|
30
30
|
pathTables[index - 1].alias.escaped
|
|
31
31
|
: (parent.tableAlias?.escaped ?? parent.table.escaped),
|
|
32
32
|
rightAlias: path.alias.escaped,
|
|
33
|
-
getLeftColName: (column) => (0, prostgles_types_1.asName)(
|
|
34
|
-
getRightColName: (column) => (0, prostgles_types_1.asName)(
|
|
33
|
+
getLeftColName: (column) => (0, prostgles_types_1.asName)((index ? pathTables[index - 1].source : parent.source).joinColumns?.[column] ?? column),
|
|
34
|
+
getRightColName: (column) => (0, prostgles_types_1.asName)(path.source.joinColumns?.[column] ?? column),
|
|
35
35
|
}));
|
|
36
36
|
const hasAggregates = fields.some((field) => field.type === "aggregation");
|
|
37
37
|
const groupBy = hasAggregates ?
|
|
@@ -47,8 +47,8 @@ const getComputedJoinQuery = (parent, child) => {
|
|
|
47
47
|
.concat(sortColumns.map((column) => (0, asNameAlias_1.asNameAlias)(column, alias.raw)))
|
|
48
48
|
.join(", ")}`,
|
|
49
49
|
...pathTables.map((path, index) => index ?
|
|
50
|
-
`INNER JOIN ${path.expression} ${path.alias.escaped} ON (${conditions[index]})`
|
|
51
|
-
: `FROM ${path.expression} ${path.alias.escaped}`),
|
|
50
|
+
`INNER JOIN ${path.source.expression} ${path.alias.escaped} ON (${conditions[index]})`
|
|
51
|
+
: `FROM ${path.source.expression} ${path.alias.escaped}`),
|
|
52
52
|
`WHERE ${[conditions[0], child.whereOpts.condition]
|
|
53
53
|
.filter(Boolean)
|
|
54
54
|
.map((condition) => `(${condition})`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getComputedJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getComputedJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AAEzC,wEAAyF;AACzF,wDAAyD;AACzD,yDAAsD;AACtD,iDAA8E;AAEvE,MAAM,oBAAoB,GAAG,CAAC,MAAgB,EAAE,KAAmB,EAAsB,EAAE;IAChG,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,KAAK,CAAC;IAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAC5C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,KAAK,CAAC,SAAS,CAAC,GAAG,CAC7D,CAAC;IACF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAChC,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,QAAQ;QACd,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,CAAC,KAAK,CAAC;QAC3D,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,KAAK,KAAK,CAAC,KAAK,CAAC,CAC3E,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY;SACnC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACvB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC3D,MAAM,MAAM,GAAG,KAAK,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1C,OAAO;YACL,GAAG,IAAI;YACP,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;YAC5D,
|
|
1
|
+
{"version":3,"file":"getComputedJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getComputedJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,7 +180,7 @@ const getInnerJoinQuery = ({ paths, q1, q2, targetTableAliasRaw, rootSelectItems
|
|
|
180
180
|
}
|
|
181
181
|
const isFirst = !i;
|
|
182
182
|
if (isFirst) {
|
|
183
|
-
const tableExpression = isLast ? q2.source.expression :
|
|
183
|
+
const tableExpression = isLast ? q2.source.expression : path.source.expression;
|
|
184
184
|
return [
|
|
185
185
|
`SELECT `,
|
|
186
186
|
` /* Join fields + select */`,
|
|
@@ -190,7 +190,7 @@ const getInnerJoinQuery = ({ paths, q1, q2, targetTableAliasRaw, rootSelectItems
|
|
|
190
190
|
];
|
|
191
191
|
}
|
|
192
192
|
return [
|
|
193
|
-
`INNER JOIN ${isLast ? q2.source.expression :
|
|
193
|
+
`INNER JOIN ${isLast ? q2.source.expression : path.source.expression} ${table.alias}`,
|
|
194
194
|
`ON ${(0, getTableJoinQuery_1.getJoinOnCondition)({
|
|
195
195
|
on: path.on,
|
|
196
196
|
leftAlias: prevTable.alias,
|
|
@@ -201,7 +201,7 @@ const getInnerJoinQuery = ({ paths, q1, q2, targetTableAliasRaw, rootSelectItems
|
|
|
201
201
|
});
|
|
202
202
|
return { innerQuery };
|
|
203
203
|
};
|
|
204
|
-
const getNestedSelectFields = ({ q, firstJoinTableAlias, _joinFields
|
|
204
|
+
const getNestedSelectFields = ({ q, firstJoinTableAlias, _joinFields }) => {
|
|
205
205
|
const targetTableAlias = q.tableAlias || q.table;
|
|
206
206
|
const requiredJoinFields = Array.from(new Set(_joinFields));
|
|
207
207
|
const selectedFields = q.select.filter((s) => s.selected);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,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;AAM7D,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,
|
|
1
|
+
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,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;AAM7D,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,CAiPlB,CAAC"}
|
|
@@ -81,10 +81,11 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
|
|
|
81
81
|
const j_selectParams = {};
|
|
82
82
|
let j_filter = {}, j_isLeftJoin = true;
|
|
83
83
|
const joinExpressionAlias = { raw: joinColumnName, escaped: (0, prostgles_types_1.asName)(joinColumnName) };
|
|
84
|
-
const j_path = (0, parseJoinPath_1.parseJoinPath)({
|
|
84
|
+
const j_path = await (0, parseJoinPath_1.parseJoinPath)({
|
|
85
85
|
rawPath: parsedJoin.type === "simple" ? joinColumnName : parsedJoin.params.path,
|
|
86
86
|
rootTable: viewHandler.name,
|
|
87
87
|
viewHandler: viewHandler,
|
|
88
|
+
localParams,
|
|
88
89
|
allowMultiOrJoin: true,
|
|
89
90
|
addShortestJoinIfMissing: true,
|
|
90
91
|
});
|
|
@@ -162,6 +163,7 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
|
|
|
162
163
|
isHaving: true,
|
|
163
164
|
}));
|
|
164
165
|
const validatedRules = viewHandler.getValidatedRules(tableRules, localParams);
|
|
166
|
+
source.rowPermissionTables?.push(...(havingOpts?.source.rowPermissionTables ?? []));
|
|
165
167
|
const newQuery = {
|
|
166
168
|
allFields: viewHandler.column_names.slice(0),
|
|
167
169
|
select,
|
|
@@ -184,6 +186,9 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
|
|
|
184
186
|
if (newQuery.select.some((s) => s.type === "aggregation") && newQuery.joins?.length) {
|
|
185
187
|
throw new Error(`Root query aggregation AND nested joins not allowed`);
|
|
186
188
|
}
|
|
189
|
+
if (source.getOptimizedExpression) {
|
|
190
|
+
source.expression = source.getOptimizedExpression(newQuery);
|
|
191
|
+
}
|
|
187
192
|
return newQuery;
|
|
188
193
|
};
|
|
189
194
|
exports.getNewQuery = getNewQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,20 @@ import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
|
3
3
|
import type { Awaitable, SelectRequestData, SelectRule } from "../../PublishParser/publishTypesAndUtils";
|
|
4
4
|
import type { PGIdentifier } from "../DboBuilder";
|
|
5
5
|
import type { ViewHandler } from "../ViewHandler/ViewHandler";
|
|
6
|
+
import type { NewQuery } from "./QueryBuilder";
|
|
6
7
|
declare const GET_TABLE_EXPRESSION: unique symbol;
|
|
7
8
|
type SelectRuleWithTableExpression = SelectRule & {
|
|
8
|
-
[GET_TABLE_EXPRESSION]?: (request: SelectRequestData) => Awaitable<string |
|
|
9
|
+
[GET_TABLE_EXPRESSION]?: (request: SelectRequestData) => Awaitable<string | Omit<QuerySource, "alias"> | undefined>;
|
|
9
10
|
};
|
|
10
11
|
export type QuerySource = {
|
|
11
12
|
expression: string;
|
|
12
13
|
alias?: PGIdentifier;
|
|
13
14
|
/** Private source columns used only by registered relationships. */
|
|
14
15
|
joinColumns?: Record<string, string>;
|
|
16
|
+
/** Tables whose changes can affect row-dependent field permissions. */
|
|
17
|
+
rowPermissionTables?: string[];
|
|
18
|
+
/** Refine a permission boundary only after the complete query has been validated. */
|
|
19
|
+
getOptimizedExpression?: (query: NewQuery) => string;
|
|
15
20
|
};
|
|
16
21
|
export declare const withTableExpression: <T extends SelectRule>(selectRule: T, getTableExpression: NonNullable<SelectRuleWithTableExpression[typeof GET_TABLE_EXPRESSION]>) => T;
|
|
17
22
|
export declare const getQuerySource: (viewHandler: ViewHandler, tableRules: ParsedTableRule | undefined, filter: SelectRequestData["filter"], params: SelectParams, preferredAlias?: PGIdentifier) => Promise<QuerySource>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuerySource.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,EACX,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"getQuerySource.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,EACX,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,QAAA,MAAM,oBAAoB,eAA+B,CAAC;AAG1D,KAAK,6BAA6B,GAAG,UAAU,GAAG;IAChD,CAAC,oBAAoB,CAAC,CAAC,EAAE,CACvB,OAAO,EAAE,iBAAiB,KACvB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;CACjE,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,uEAAuE;IACvE,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,qFAAqF;IACrF,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,MAAM,CAAC;CACtD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,UAAU,EACtD,YAAY,CAAC,EACb,oBAAoB,WAAW,CAAC,6BAA6B,CAAC,OAAO,oBAAoB,CAAC,CAAC,KAC1F,CAEF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,aAAa,WAAW,EACxB,YAAY,eAAe,GAAG,SAAS,EACvC,QAAQ,iBAAiB,CAAC,QAAQ,CAAC,EACnC,QAAQ,YAAY,EACpB,iBAAiB,YAAY,KAC5B,OAAO,CAAC,WAAW,CAmBrB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,uBAAuB,WAAW,WAEnE,CAAC"}
|
|
@@ -17,9 +17,10 @@ const getQuerySource = async (viewHandler, tableRules, filter, params, preferred
|
|
|
17
17
|
{ raw: TABLE_EXPRESSION_ALIAS, escaped: (0, prostgles_types_1.asName)(TABLE_EXPRESSION_ALIAS) }
|
|
18
18
|
: undefined);
|
|
19
19
|
return {
|
|
20
|
-
|
|
20
|
+
...(typeof tableExpression === "object" ? tableExpression : ({
|
|
21
|
+
expression: tableExpression ?? viewHandler.escapedName,
|
|
22
|
+
})),
|
|
21
23
|
alias,
|
|
22
|
-
joinColumns: typeof tableExpression === "object" ? tableExpression.joinColumns : undefined,
|
|
23
24
|
};
|
|
24
25
|
};
|
|
25
26
|
exports.getQuerySource = getQuerySource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuerySource.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;
|
|
1
|
+
{"version":3,"file":"getQuerySource.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAW5D,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC1D,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;AAmBrD,MAAM,mBAAmB,GAAG,CACjC,UAAa,EACb,kBAA2F,EACxF,EAAE;IACL,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,UAAuC,EACvC,MAAmC,EACnC,MAAoB,EACpB,cAA6B,EACP,EAAE;IACxB,MAAM,UAAU,GAAG,UAAU,EAAE,MAAmD,CAAC;IACnF,MAAM,kBAAkB,GAAG,UAAU,EAAE,CAAC,oBAAoB,CAAC,CAAC;IAC9D,MAAM,eAAe,GACnB,kBAAkB,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,MAAM,KAAK,GACT,cAAc;QACd,CAAC,eAAe,CAAC,CAAC;YAChB,EAAE,GAAG,EAAE,sBAAsB,EAAE,OAAO,EAAE,IAAA,wBAAM,EAAC,sBAAsB,CAAC,EAAE;YAC1E,CAAC,CAAC,SAAS,CAAC,CAAC;IAEf,OAAO;QACL,GAAG,CAAC,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAC1D;YACE,UAAU,EAAE,eAAe,IAAI,WAAW,CAAC,WAAW;SACvD,CACF,CAAC;QACF,KAAK;KACN,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,cAAc,kBAyBzB;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,UAAU,EAAE,KAAK,EAAe,EAAE,EAAE;IACtE,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedTableRules.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableRules/getValidatedTableRules.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"getValidatedTableRules.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableRules/getValidatedTableRules.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,mBAAmB,CA6JrB"}
|
|
@@ -57,6 +57,7 @@ function getValidatedTableRules(tableRules, localParams) {
|
|
|
57
57
|
}
|
|
58
58
|
const fields = this.parseFieldFilter(tableRules.select.fields);
|
|
59
59
|
res.select = {
|
|
60
|
+
disableMethods: tableRules.select.disableMethods,
|
|
60
61
|
fields,
|
|
61
62
|
orderByFields: tableRules.select.orderByFields ?
|
|
62
63
|
this.parseFieldFilter(tableRules.select.orderByFields)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedTableRules.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableRules/getValidatedTableRules.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"getValidatedTableRules.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableRules/getValidatedTableRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
|
+
import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
1
2
|
import type { ExistsFilterConfig, LocalParams } from "../DboBuilder";
|
|
2
3
|
import type { ViewHandler } from "./ViewHandler";
|
|
3
4
|
export declare function getExistsCondition(this: ViewHandler, eConfig: ExistsFilterConfig, rootTableAlias: string | undefined, localParams: LocalParams | undefined, rootJoinColumns: Record<string, string> | undefined): Promise<string>;
|
|
5
|
+
declare const EXISTS_TABLE_RULES: unique symbol;
|
|
6
|
+
type FilterWithTableRules = ExistsFilterConfig["targetTableFilter"] & {
|
|
7
|
+
[EXISTS_TABLE_RULES]?: ParsedTableRule;
|
|
8
|
+
};
|
|
9
|
+
/** Internal inferred permissions reuse the target's normalized select rule. */
|
|
10
|
+
export declare const withExistsTableRules: (tableRules: ParsedTableRule) => FilterWithTableRules;
|
|
11
|
+
export {};
|
|
4
12
|
//# sourceMappingURL=getExistsCondition.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GAClD,OAAO,CAAC,MAAM,CAAC,CAwFjB;AAED,QAAA,MAAM,kBAAkB,eAA6B,CAAC;AACtD,KAAK,oBAAoB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,GAAG;IACpE,CAAC,kBAAkB,CAAC,CAAC,EAAE,eAAe,CAAC;CACxC,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,oBAAoB,GAAI,YAAY,eAAe,KAAG,oBAEjE,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.withExistsTableRules = void 0;
|
|
3
4
|
exports.getExistsCondition = getExistsCondition;
|
|
4
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
6
|
const getQuerySource_1 = require("../QueryBuilder/getQuerySource");
|
|
@@ -20,7 +21,7 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams, rootJoin
|
|
|
20
21
|
if (localParams?.isRemoteRequest && !localParams.clientReq) {
|
|
21
22
|
throw "Unexpected: localParams isRemoteRequest and missing clientReq";
|
|
22
23
|
}
|
|
23
|
-
let targetTableRules =
|
|
24
|
+
let targetTableRules = targetTableFilter[EXISTS_TABLE_RULES];
|
|
24
25
|
const targetTable = eConfig.isJoined ? eConfig.parsedPath.at(-1).table : eConfig.targetTable;
|
|
25
26
|
const tableHandler = this.dboBuilder.dboMap.get(targetTable);
|
|
26
27
|
if (!tableHandler) {
|
|
@@ -52,6 +53,17 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams, rootJoin
|
|
|
52
53
|
});
|
|
53
54
|
const { source: targetSource, where: finalWhere } = whereOpts;
|
|
54
55
|
eConfig.targetTableColumns = whereOpts.columnsUsed;
|
|
56
|
+
eConfig.rowPermissionTables = [
|
|
57
|
+
...(targetSource.rowPermissionTables ?? []),
|
|
58
|
+
...(eConfig.isJoined ?
|
|
59
|
+
eConfig.parsedPath.flatMap((part) => part.source?.rowPermissionTables ?? [])
|
|
60
|
+
: []),
|
|
61
|
+
];
|
|
62
|
+
eConfig.dependencyTables = [
|
|
63
|
+
...(eConfig.isJoined ? eConfig.parsedPath.map(({ table }) => table) : [targetTable]),
|
|
64
|
+
...eConfig.rowPermissionTables,
|
|
65
|
+
...whereOpts.exists.flatMap((filter) => filter.dependencyTables ?? []),
|
|
66
|
+
];
|
|
55
67
|
let innerQuery = [
|
|
56
68
|
`SELECT 1`,
|
|
57
69
|
`FROM ${(0, getQuerySource_1.getQuerySourceSQL)(targetSource)}`,
|
|
@@ -71,4 +83,10 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams, rootJoin
|
|
|
71
83
|
}
|
|
72
84
|
return `${isNotExists ? " NOT " : " "} EXISTS ( \n${innerQuery} \n) `;
|
|
73
85
|
}
|
|
86
|
+
const EXISTS_TABLE_RULES = Symbol("existsTableRules");
|
|
87
|
+
/** Internal inferred permissions reuse the target's normalized select rule. */
|
|
88
|
+
const withExistsTableRules = (tableRules) => ({
|
|
89
|
+
[EXISTS_TABLE_RULES]: tableRules,
|
|
90
|
+
});
|
|
91
|
+
exports.withExistsTableRules = withExistsTableRules;
|
|
74
92
|
//# sourceMappingURL=getExistsCondition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ExistsFilterConfig } from "../DboBuilder";
|
|
1
|
+
import type { ExistsFilterConfig, LocalParams } from "../DboBuilder";
|
|
2
2
|
import type { ViewHandler } from "./ViewHandler";
|
|
3
|
-
export declare const getExistsFilters: (filter: any, viewHandler: ViewHandler) => ExistsFilterConfig[]
|
|
3
|
+
export declare const getExistsFilters: (filter: any, viewHandler: ViewHandler, localParams: LocalParams | undefined) => Promise<ExistsFilterConfig[]>;
|
|
4
4
|
//# sourceMappingURL=getExistsFilters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsFilters.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getExistsFilters.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,GAAG,EACX,aAAa,WAAW,EACxB,aAAa,WAAW,GAAG,SAAS,KACnC,OAAO,CAAC,kBAAkB,EAAE,CA4E9B,CAAC"}
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getExistsFilters = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const parseJoinPath_1 = require("./parseJoinPath");
|
|
6
|
-
const getExistsFilters = (filter, viewHandler) => {
|
|
6
|
+
const getExistsFilters = (filter, viewHandler, localParams) => {
|
|
7
7
|
/* Exists join filter */
|
|
8
8
|
const ERR = 'Invalid exists filter. \nExpecting something like: \n | { $exists: { tableName.tableName2: Filter } } \n | { $exists: { "**.tableName3": Filter } }\n | { path: string[]; filter: AnyObject }';
|
|
9
9
|
const existsConfigs = (0, prostgles_types_1.getKeys)(filter)
|
|
10
10
|
.filter((k) => prostgles_types_1.EXISTS_KEYS.includes(k) && !!Object.keys(filter[k] ?? {}).length)
|
|
11
|
-
.map((key) => {
|
|
11
|
+
.map(async (key) => {
|
|
12
12
|
const isJoined = key.toLowerCase().includes("join");
|
|
13
13
|
const filterValue = filter[key];
|
|
14
14
|
/**
|
|
@@ -54,17 +54,18 @@ const getExistsFilters = (filter, viewHandler) => {
|
|
|
54
54
|
isJoined: true,
|
|
55
55
|
existType: key,
|
|
56
56
|
path,
|
|
57
|
-
parsedPath: (0, parseJoinPath_1.parseJoinPath)({
|
|
57
|
+
parsedPath: await (0, parseJoinPath_1.parseJoinPath)({
|
|
58
58
|
rawPath: path,
|
|
59
59
|
rootTable: viewHandler.name,
|
|
60
60
|
viewHandler,
|
|
61
|
+
localParams,
|
|
61
62
|
allowMultiOrJoin: true,
|
|
62
63
|
}),
|
|
63
64
|
targetTableFilter,
|
|
64
65
|
targetTableColumns: [],
|
|
65
66
|
};
|
|
66
67
|
});
|
|
67
|
-
return existsConfigs;
|
|
68
|
+
return Promise.all(existsConfigs);
|
|
68
69
|
};
|
|
69
70
|
exports.getExistsFilters = getExistsFilters;
|
|
70
71
|
//# sourceMappingURL=getExistsFilters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsFilters.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":";;;AACA,qDAAuD;AAGvD,mDAAgD;AAEzC,MAAM,gBAAgB,GAAG,
|
|
1
|
+
{"version":3,"file":"getExistsFilters.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ type getTableJoinsArgs = {
|
|
|
4
4
|
rootTableAlias: string;
|
|
5
5
|
type: "INNER" | "LEFT" | "EXISTS";
|
|
6
6
|
finalWhere?: string;
|
|
7
|
-
finalTableExpression
|
|
7
|
+
finalTableExpression: string;
|
|
8
8
|
path: ParsedJoinPath[];
|
|
9
9
|
rootJoinColumns?: Record<string, string>;
|
|
10
10
|
targetJoinColumns?: Record<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC;AACF,eAAO,MAAM,iBAAiB,GAAI,uGAQ/B,iBAAiB,KAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAwE1D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,EAAE,WAAW,MAAM,KAAG,YAIpE,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC3C,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,+EAOjC,sBAAsB,aAaxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,sBAAsB,WAE9D,CAAC"}
|
|
@@ -9,20 +9,20 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, finalTableE
|
|
|
9
9
|
throw `Cannot create join query for empty path`;
|
|
10
10
|
}
|
|
11
11
|
const getTableAlias = (table, pathIndex) => (0, exports.getTableJoinAlias)(table, pathIndex).escaped;
|
|
12
|
+
const firstJoinColumns = path.length === 1 ? targetJoinColumns : firstPath.source.joinColumns;
|
|
12
13
|
const query = path
|
|
13
|
-
.map(({ table, on, computedJoin }, i) => {
|
|
14
|
-
const tableName = table;
|
|
14
|
+
.map(({ table, on, computedJoin, source }, i) => {
|
|
15
15
|
const tableAlias = getTableAlias(table, i);
|
|
16
16
|
const prevTableAlias = i === 0 ? rootTableAlias : getTableAlias(path[i - 1].table, i - 1);
|
|
17
|
+
const leftJoinColumns = i ? path[i - 1].source.joinColumns : rootJoinColumns;
|
|
18
|
+
const rightJoinColumns = i === path.length - 1 ? targetJoinColumns : source.joinColumns;
|
|
17
19
|
const onCondition = (0, exports.getJoinOnCondition)({
|
|
18
20
|
on,
|
|
19
21
|
computedJoin,
|
|
20
22
|
leftAlias: prevTableAlias,
|
|
21
23
|
rightAlias: tableAlias,
|
|
22
|
-
getLeftColName: (column) => (0, prostgles_types_1.asName)(computedJoin
|
|
23
|
-
getRightColName: (column) => (0, prostgles_types_1.asName)(computedJoin
|
|
24
|
-
(targetJoinColumns?.[column] ?? column)
|
|
25
|
-
: column),
|
|
24
|
+
getLeftColName: (column) => (0, prostgles_types_1.asName)(computedJoin ? (leftJoinColumns?.[column] ?? column) : column),
|
|
25
|
+
getRightColName: (column) => (0, prostgles_types_1.asName)(computedJoin ? (rightJoinColumns?.[column] ?? column) : column),
|
|
26
26
|
});
|
|
27
27
|
const isExists = type === "EXISTS";
|
|
28
28
|
const joinType = isExists ? "INNER" : type;
|
|
@@ -40,16 +40,14 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, finalTableE
|
|
|
40
40
|
leftAlias: rootTableAlias,
|
|
41
41
|
rightAlias: getTableAlias(firstPath.table, 0),
|
|
42
42
|
getLeftColName: (column) => (0, prostgles_types_1.asName)(firstPath.computedJoin ? (rootJoinColumns?.[column] ?? column) : column),
|
|
43
|
-
getRightColName: (column) => (0, prostgles_types_1.asName)(firstPath.computedJoin
|
|
44
|
-
(targetJoinColumns?.[column] ?? column)
|
|
45
|
-
: column),
|
|
43
|
+
getRightColName: (column) => (0, prostgles_types_1.asName)(firstPath.computedJoin ? (firstJoinColumns?.[column] ?? column) : column),
|
|
46
44
|
}),
|
|
47
45
|
finalWhere,
|
|
48
46
|
]
|
|
49
47
|
.filter(Boolean)
|
|
50
48
|
.join(") AND (")})`
|
|
51
49
|
: "";
|
|
52
|
-
const tableSelect = isLast ?
|
|
50
|
+
const tableSelect = isLast ? finalTableExpression : source.expression;
|
|
53
51
|
if (isExists && isFirst) {
|
|
54
52
|
return [`SELECT 1`, `FROM ${tableSelect} ${tableAlias}`, whereJoinCondition]
|
|
55
53
|
.filter((v) => v)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AAGzC,0DAA4D;AAWrD,MAAM,iBAAiB,GAAG,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,eAAe,EACf,iBAAiB,GACC,EAA0C,EAAE;IAC9D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,yCAAyC,CAAC;IAClD,CAAC;IACD,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,SAAiB,EAAE,EAAE,CACzD,IAAA,yBAAiB,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"getTableJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"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"}
|