prostgles-server 4.1.56 → 4.1.58
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/QueryBuilder/getJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +4 -3
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts +2 -2
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +5 -3
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/find.d.ts.map +1 -1
- package/dist/DboBuilder/find.js +1 -1
- package/dist/DboBuilder/find.js.map +1 -1
- package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +4 -3
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +3 -3
- package/lib/DboBuilder/find.ts +0 -1
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/isomorphic_queries.ts +81 -0
- package/tests/server/DBoGenerated.d.ts +109 -17
- package/tests/server/index.ts +4 -1
- package/tests/server/init.sql +18 -0
- package/tests/server/package-lock.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAA2B,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,YAAa,MAAM;;;CAMzC,CAAA;
|
|
1
|
+
{"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAA2B,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,YAAa,MAAM;;;CAMzC,CAAA;AAYD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,gBAAiB,WAAW,qBAAqB,IAAI;gBAAiB,MAAM,EAAE;2BAAyB,MAAM,EAAE;;CA2EvI,CAAA"}
|
|
@@ -18,9 +18,10 @@ const getJoinCol = (colName) => {
|
|
|
18
18
|
};
|
|
19
19
|
exports.getJoinCol = getJoinCol;
|
|
20
20
|
const getJoinTable = (tableName, pathIndex, isLastTableAlias) => {
|
|
21
|
-
const rawAlias = isLastTableAlias ?? `p${pathIndex}
|
|
21
|
+
const rawAlias = isLastTableAlias ?? `p${pathIndex} ${tableName}`;
|
|
22
22
|
return {
|
|
23
|
-
name:
|
|
23
|
+
// name: asName(tableName), /** table names are already escaped */
|
|
24
|
+
name: tableName,
|
|
24
25
|
alias: (0, prostgles_types_1.asName)(rawAlias),
|
|
25
26
|
rawAlias,
|
|
26
27
|
};
|
|
@@ -53,7 +54,7 @@ const getJoinQuery = (viewHandler, { q1, q2, depth }) => {
|
|
|
53
54
|
const targetQueryExtraQueries = [];
|
|
54
55
|
// const prevTableAlias = !i? (q1.tableAlias ?? q1.table) : `t${i-1}`;
|
|
55
56
|
// const tableAlias = isLast? targetTableAlias : asName(`t${i}`);
|
|
56
|
-
const prevTable = getJoinTable(!i ? (q1.tableAlias
|
|
57
|
+
const prevTable = getJoinTable(!i ? (q1.tableAlias ? (0, prostgles_types_1.asName)(q1.tableAlias) : q1.table) : paths[i - 1].table, i - 1, undefined);
|
|
57
58
|
// const tableAlias = isLast? targetTableAlias : asName(path.table);
|
|
58
59
|
const table = getJoinTable(path.table, i, isLast ? targetTableAliasRaw : undefined);
|
|
59
60
|
if (isLast) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AACpD,gEAA6D;AAC7D,iDAAiF;AACjF,qDAA+C;AAE/C,wEAAsE;AAStE;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE;IAC5C,MAAM,KAAK,GAAG,IAAA,wBAAM,EAAC,iBAAiB,GAAG,OAAO,CAAC,CAAC;IAClD,OAAO;QACL,KAAK;QACL,UAAU,EAAE,GAAG,IAAA,wBAAM,EAAC,OAAO,CAAC,OAAO,KAAK,EAAE;KAC7C,CAAA;AACH,CAAC,CAAA;AANY,QAAA,UAAU,cAMtB;AAED,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,gBAAoC,EAAE,EAAE;IAClG,MAAM,QAAQ,GAAG,gBAAgB,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;IACnE,OAAO;QACL,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { TableHandler } from "../TableHandler";
|
|
2
2
|
import { TableRule } from "../../PublishParser";
|
|
3
3
|
import { Filter, LocalParams } from "../../DboBuilder";
|
|
4
|
-
import {
|
|
4
|
+
import { RawJoinPath } from "prostgles-types";
|
|
5
5
|
import { NewQuery } from "./QueryBuilder";
|
|
6
6
|
export declare function getNewQuery(_this: TableHandler, filter: Filter, selectParams: ({
|
|
7
7
|
limit?: number | undefined;
|
|
@@ -246,5 +246,5 @@ export declare function getNewQuery(_this: TableHandler, filter: Filter, selectP
|
|
|
246
246
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
247
247
|
} & {
|
|
248
248
|
alias?: string | undefined;
|
|
249
|
-
}) | undefined, param3_unused: null | undefined, tableRules: TableRule | undefined, localParams: LocalParams | undefined
|
|
249
|
+
}) | undefined, param3_unused: null | undefined, tableRules: TableRule | undefined, localParams: LocalParams | undefined): Promise<NewQuery>;
|
|
250
250
|
//# sourceMappingURL=getNewQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAiG,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE7I,OAAO,EAAE,QAAQ,EAAmC,MAAM,gBAAgB,CAAC;AA0D3E,wBAAsB,WAAW,CAC/B,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA2C,EACvD,aAAa,kBAAO,EACpB,UAAU,EAAE,SAAS,GAAG,SAAS,EACjC,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,QAAQ,CAAC,CAoJnB"}
|
|
@@ -54,7 +54,8 @@ const parseJoinSelect = (joinParams) => {
|
|
|
54
54
|
params: joinParams
|
|
55
55
|
};
|
|
56
56
|
};
|
|
57
|
-
async function getNewQuery(_this, filter, selectParams = {}, param3_unused = null, tableRules, localParams
|
|
57
|
+
async function getNewQuery(_this, filter, selectParams = {}, param3_unused = null, tableRules, localParams) {
|
|
58
|
+
const { columns } = _this;
|
|
58
59
|
if (localParams?.isRemoteRequest && !tableRules?.select?.fields) {
|
|
59
60
|
throw `INTERNAL ERROR: publish.${_this.name}.select.fields rule missing`;
|
|
60
61
|
}
|
|
@@ -116,8 +117,9 @@ async function getNewQuery(_this, filter, selectParams = {}, param3_unused = nul
|
|
|
116
117
|
isLocal = false;
|
|
117
118
|
j_tableRules = await _this.dboBuilder.publishParser?.getValidatedRequestRuleWusr({ tableName: jTable, command: "find", localParams });
|
|
118
119
|
}
|
|
119
|
-
|
|
120
|
-
|
|
120
|
+
const isAllowedAccessToTable = isLocal || j_tableRules;
|
|
121
|
+
if (isAllowedAccessToTable) {
|
|
122
|
+
const joinQuery = await getNewQuery(_thisJoinedTable, j_filter, { ...j_selectParams, alias: j_alias }, param3_unused, j_tableRules, localParams);
|
|
121
123
|
joinQuery.isLeftJoin = j_isLeftJoin;
|
|
122
124
|
joinQuery.tableAlias = j_alias;
|
|
123
125
|
joinQueries.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAIlC,qDAA6I;AAC7I,2CAAyD;AACzD,iDAA2E;AAC3E,gEAA6D;AAC7D,sEAAmE;AAEnE,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,WAAW,CAAU,CAAC;AAMvD,MAAM,eAAe,GAAG,CAAC,UAA+B,EAAc,EAAE;IACtE,IAAG,CAAC,UAAU,EAAC;QACb,OAAO;YACL,KAAK,EAAE,mBAAmB;SAC3B,CAAA;KACF;IACD,IAAG,OAAO,UAAU,KAAK,QAAQ,EAAC;QAChC,IAAG,UAAU,KAAK,GAAG,EAAC;YACpB,MAAM,sCAAsC,CAAA;SAC7C;QACD,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,UAAU;SACnB,CAAA;KACF;IACD,MAAM,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,GAAG,IAAA,yBAAO,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC,CAAC;IAC9F,IAAG,SAAS,CAAC,MAAM,EAAE;QACnB,OAAO;YACL,KAAK,EAAE,oEAAoE;SAC5E,CAAA;KACF;SAAM,IAAG,OAAO,EAAE;QAEjB,gFAAgF;QAChF,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAU,CAAC;QAC9F,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,GAAG,WAAW,EAAE,GAAG,SAAS,CAAE,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC,CAAC;QAChH,IAAG,aAAa,CAAC,MAAM,EAAE;YACvB,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1D;QACD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAwB,CAAC;QACxD,IAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAC;YACrC,MAAM,4CAA4C,OAAO,EAAE,CAAA;SAC5D;QACD,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE;gBACN,GAAI,UAAiC;gBACrC,IAAI;gBACJ,KAAK,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK;aAC3D;SACF,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,UAA8B;KACvC,CAAA;AACH,CAAC,CAAA;AAEM,KAAK,UAAU,WAAW,CAC/B,KAAmB,EACnB,MAAc,EACd,eAAqD,EAAE,EACvD,aAAa,GAAG,IAAI,EACpB,UAAiC,EACjC,WAAoC,
|
|
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":"find.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAiD,MAAM,eAAe,CAAC;AAGnG,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,eAAO,MAAM,IAAI,SAAwB,WAAW,WAAW,MAAM,iBAAiB,YAAY,kBAAkB,SAAS,eAAe,SAAS,gBAAgB,WAAW,KAAG,QAAQ,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAiD,MAAM,eAAe,CAAC;AAGnG,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,eAAO,MAAM,IAAI,SAAwB,WAAW,WAAW,MAAM,iBAAiB,YAAY,kBAAkB,SAAS,eAAe,SAAS,gBAAgB,WAAW,KAAG,QAAQ,GAAG,EAAE,CAuE/L,CAAA;AAGD,eAAO,MAAM,kBAAkB,UAAiB,MAAM,cAAc,YAAY,CAAC,YAAY,CAAC,WAAW,WAAW,GAAG,YAAY,eAAe,WAAW,GAAG,SAAS,iBAoBxK,CAAA"}
|
package/dist/DboBuilder/find.js
CHANGED
|
@@ -37,7 +37,7 @@ const find = async function (filter, selectParams, param3_unused, tableRules, lo
|
|
|
37
37
|
if (maxLimit && !Number.isInteger(maxLimit))
|
|
38
38
|
throw ` invalid publish.${this.name}.select.maxLimit -> expecting integer but got ` + maxLimit;
|
|
39
39
|
}
|
|
40
|
-
const q = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParams, param3_unused, tableRules, localParams
|
|
40
|
+
const q = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParams, param3_unused, tableRules, localParams);
|
|
41
41
|
const queryWithoutRLS = (0, getSelectQuery_1.getSelectQuery)(this, q, undefined, !!selectParams?.groupBy);
|
|
42
42
|
const queryWithRLS = (0, DboBuilder_1.withUserRLS)(localParams, queryWithoutRLS);
|
|
43
43
|
// console.log(_query, JSON.stringify(q, null, 2))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":";;;AACA,qDAAyD;AACzD,8CAAmG;AACnG,kEAA+D;AAC/D,iDAAiD;AAGjD,4DAAyD;AAGlD,MAAM,IAAI,GAAG,KAAK,WAA6B,MAAe,EAAE,YAA2B,EAAE,aAAyB,EAAE,UAAsB,EAAE,WAAyB;IAC9K,IAAI;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,MAAM,kBAAkB,GAAsC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QACrG,MAAM,EAAE,UAAU,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;QAC1C,IAAI,UAAU,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1D,MAAM,eAAe,UAAU,iBAAiB,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;SAClF;QAED,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK,EAAE,cAAc,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QAEpF,IAAI,QAAQ;YAAE,OAAO,EAAE,CAAC;QACxB,IAAI,YAAY,EAAE;YAChB,MAAM,WAAW,GAA8B,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;YACjH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC,CAAC;YAC1F,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM;gBAAE,MAAM,kBAAkB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpI;QAED,sBAAsB;QACtB,IAAI,UAAU,EAAE;YAEd,IAAI,CAAC,UAAU,CAAC,MAAM;gBAAE,MAAM,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC;YACtE,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;YACxC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;YAE5C,IAAS,UAAU,CAAC,MAAM,KAAK,GAAG,IAAI,OAAO,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAA,0BAAQ,EAAC,UAAU,CAAC,MAAM,CAAC;gBAAE,MAAM,qBAAqB,IAAI,CAAC,IAAI,iEAAiE,CAAA;YACnN,IAAI,CAAC,MAAM;gBAAE,MAAM,YAAY,IAAI,CAAC,IAAI,8HAA8H,CAAC;YACvK,IAAI,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;gBAAE,MAAM,oBAAoB,IAAI,CAAC,IAAI,gDAAgD,GAAG,QAAQ,CAAC;SAC7I;QAED,MAAM,CAAC,GAAG,MAAM,IAAA,yBAAW,EACzB,IAA+B,EAC/B,MAAM,EACN,YAAY,EACZ,aAAa,EACb,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,10 @@ export const getJoinCol = (colName: string) => {
|
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
const getJoinTable = (tableName: string, pathIndex: number, isLastTableAlias: string | undefined) => {
|
|
27
|
-
const rawAlias = isLastTableAlias ?? `p${pathIndex}
|
|
27
|
+
const rawAlias = isLastTableAlias ?? `p${pathIndex} ${tableName}`;
|
|
28
28
|
return {
|
|
29
|
-
name: asName(tableName),
|
|
29
|
+
// name: asName(tableName), /** table names are already escaped */
|
|
30
|
+
name: tableName,
|
|
30
31
|
alias: asName(rawAlias),
|
|
31
32
|
rawAlias,
|
|
32
33
|
}
|
|
@@ -65,7 +66,7 @@ export const getJoinQuery = (viewHandler: ViewHandler, { q1, q2, depth }: Args):
|
|
|
65
66
|
// const prevTableAlias = !i? (q1.tableAlias ?? q1.table) : `t${i-1}`;
|
|
66
67
|
// const tableAlias = isLast? targetTableAlias : asName(`t${i}`);
|
|
67
68
|
|
|
68
|
-
const prevTable = getJoinTable(!i? (q1.tableAlias
|
|
69
|
+
const prevTable = getJoinTable(!i? (q1.tableAlias? asName(q1.tableAlias) : q1.table) : paths[i-1]!.table, i-1, undefined);
|
|
69
70
|
// const tableAlias = isLast? targetTableAlias : asName(path.table);
|
|
70
71
|
const table = getJoinTable(path.table, i, isLast? targetTableAliasRaw : undefined);
|
|
71
72
|
|
|
@@ -69,8 +69,8 @@ export async function getNewQuery(
|
|
|
69
69
|
param3_unused = null,
|
|
70
70
|
tableRules: TableRule | undefined,
|
|
71
71
|
localParams: LocalParams | undefined,
|
|
72
|
-
columns: ColumnInfo[],
|
|
73
72
|
): Promise<NewQuery> {
|
|
73
|
+
const { columns } = _this;
|
|
74
74
|
|
|
75
75
|
if(localParams?.isRemoteRequest && !tableRules?.select?.fields){
|
|
76
76
|
throw `INTERNAL ERROR: publish.${_this.name}.select.fields rule missing`;
|
|
@@ -149,7 +149,8 @@ export async function getNewQuery(
|
|
|
149
149
|
j_tableRules = await _this.dboBuilder.publishParser?.getValidatedRequestRuleWusr({ tableName: jTable, command: "find", localParams });
|
|
150
150
|
}
|
|
151
151
|
|
|
152
|
-
|
|
152
|
+
const isAllowedAccessToTable = isLocal || j_tableRules;
|
|
153
|
+
if(isAllowedAccessToTable){
|
|
153
154
|
|
|
154
155
|
const joinQuery: NewQuery = await getNewQuery(
|
|
155
156
|
_thisJoinedTable,
|
|
@@ -158,7 +159,6 @@ export async function getNewQuery(
|
|
|
158
159
|
param3_unused,
|
|
159
160
|
j_tableRules,
|
|
160
161
|
localParams,
|
|
161
|
-
columns
|
|
162
162
|
);
|
|
163
163
|
joinQuery.isLeftJoin = j_isLeftJoin;
|
|
164
164
|
joinQuery.tableAlias = j_alias;
|
package/lib/DboBuilder/find.ts
CHANGED
package/package.json
CHANGED
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
111733
|
|
@@ -874,6 +874,72 @@ export default async function isomorphic(db: Required<DBHandlerServer> | Require
|
|
|
874
874
|
|
|
875
875
|
});
|
|
876
876
|
|
|
877
|
+
await tryRun("Join escaped table names with quotes", async () => {
|
|
878
|
+
await db[`"""quoted0"""`].insert({
|
|
879
|
+
[`"text_col0"`]: "0",
|
|
880
|
+
[`"quoted1_id"`]: {
|
|
881
|
+
[`"text_col1"`]: "1",
|
|
882
|
+
[`"quoted2_id"`]: {
|
|
883
|
+
[`"text_col2"`]: "2",
|
|
884
|
+
}
|
|
885
|
+
}
|
|
886
|
+
});
|
|
887
|
+
|
|
888
|
+
const res = await db[`"""quoted0"""`].find({
|
|
889
|
+
[`"text_col0"`]: "0",
|
|
890
|
+
}, {
|
|
891
|
+
select: {
|
|
892
|
+
"*": 1,
|
|
893
|
+
[`"""quoted2"""`]: {
|
|
894
|
+
[`"text_col2"`]: 1,
|
|
895
|
+
[`"id2"`]: "$min",
|
|
896
|
+
[`id2 max`]: { "$max": [`"id2"`] },
|
|
897
|
+
}
|
|
898
|
+
}
|
|
899
|
+
});
|
|
900
|
+
|
|
901
|
+
assert.deepStrictEqual(res[0], {
|
|
902
|
+
'"""quoted2"""': [
|
|
903
|
+
{
|
|
904
|
+
'"text_col2"': '2',
|
|
905
|
+
'id2 max': 1,
|
|
906
|
+
'"id2"': 1,
|
|
907
|
+
}
|
|
908
|
+
],
|
|
909
|
+
'"id0"': 1,
|
|
910
|
+
'"quoted1_id"': 1,
|
|
911
|
+
'"text_col0"': '0'
|
|
912
|
+
});
|
|
913
|
+
|
|
914
|
+
|
|
915
|
+
const aliasedQuotedJoin = await db[`"""quoted0"""`].find({
|
|
916
|
+
[`"text_col0"`]: "0",
|
|
917
|
+
}, {
|
|
918
|
+
select: {
|
|
919
|
+
"*": 1,
|
|
920
|
+
'"ali as"': {
|
|
921
|
+
$leftJoin: '"""quoted2"""',
|
|
922
|
+
select: {
|
|
923
|
+
'"text_col2"': { $left: ['"text_col2"', 2] },
|
|
924
|
+
'"id2"': "$min",
|
|
925
|
+
'id2 max': { "$max": [`"id2"`] },
|
|
926
|
+
}
|
|
927
|
+
}
|
|
928
|
+
}
|
|
929
|
+
});
|
|
930
|
+
|
|
931
|
+
assert.deepStrictEqual(aliasedQuotedJoin, [{
|
|
932
|
+
'"id0"': 1,
|
|
933
|
+
'"quoted1_id"': 1,
|
|
934
|
+
'"text_col0"': '0',
|
|
935
|
+
'"ali as"': [{
|
|
936
|
+
'"text_col2"': '2',
|
|
937
|
+
'"id2"': 1,
|
|
938
|
+
'id2 max': 1,
|
|
939
|
+
}]
|
|
940
|
+
}])
|
|
941
|
+
})
|
|
942
|
+
|
|
877
943
|
await tryRun("Reverse join with agg", async () => {
|
|
878
944
|
const inserted = await db.tr1.insert!({ tr2: { t1: "a", t2: "b" } }, { returning: "*" });
|
|
879
945
|
|
|
@@ -921,6 +987,21 @@ export default async function isomorphic(db: Required<DBHandlerServer> | Require
|
|
|
921
987
|
sortedAsc.map(d => d.tr2[0].maxId).slice(0).reverse(),
|
|
922
988
|
sortedDesc.map(d => d.tr2[0].maxId)
|
|
923
989
|
);
|
|
990
|
+
});
|
|
991
|
+
|
|
992
|
+
await tryRun("Nested function on different than source column getNewQuery name bug fix", async () => {
|
|
993
|
+
const res = await db.tr1.find!({}, {
|
|
994
|
+
select: {
|
|
995
|
+
"*": 1,
|
|
996
|
+
tr2: {
|
|
997
|
+
sign: { $sign: ["tr1_id"] }
|
|
998
|
+
}
|
|
999
|
+
},
|
|
1000
|
+
orderBy: {
|
|
1001
|
+
id: true
|
|
1002
|
+
}
|
|
1003
|
+
});
|
|
1004
|
+
assert.deepStrictEqual(res.map(row => [row.id, row.tr2[0]!.sign]), [[1,1], [2, 1]]);
|
|
924
1005
|
})
|
|
925
1006
|
|
|
926
1007
|
await tryRun("Reference column deep nested insert", async () => {
|
|
@@ -14,6 +14,42 @@ export type DBSchemaGenerated = {
|
|
|
14
14
|
columns: {
|
|
15
15
|
"\"*\""?: null | string;
|
|
16
16
|
id?: number;
|
|
17
|
+
qq?: null | string;
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
"\"\"\"quoted0\"\"\"": {
|
|
21
|
+
is_view: false;
|
|
22
|
+
select: true;
|
|
23
|
+
insert: true;
|
|
24
|
+
update: true;
|
|
25
|
+
delete: true;
|
|
26
|
+
columns: {
|
|
27
|
+
"\"id0\""?: number;
|
|
28
|
+
"\"quoted1_id\""?: null | number;
|
|
29
|
+
"\"text_col0\""?: null | string;
|
|
30
|
+
};
|
|
31
|
+
};
|
|
32
|
+
"\"\"\"quoted1\"\"\"": {
|
|
33
|
+
is_view: false;
|
|
34
|
+
select: true;
|
|
35
|
+
insert: true;
|
|
36
|
+
update: true;
|
|
37
|
+
delete: true;
|
|
38
|
+
columns: {
|
|
39
|
+
"\"id1\""?: number;
|
|
40
|
+
"\"quoted2_id\""?: null | number;
|
|
41
|
+
"\"text_col1\""?: null | string;
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
"\"\"\"quoted2\"\"\"": {
|
|
45
|
+
is_view: false;
|
|
46
|
+
select: true;
|
|
47
|
+
insert: true;
|
|
48
|
+
update: true;
|
|
49
|
+
delete: true;
|
|
50
|
+
columns: {
|
|
51
|
+
"\"id2\""?: number;
|
|
52
|
+
"\"text_col2\""?: null | string;
|
|
17
53
|
};
|
|
18
54
|
};
|
|
19
55
|
"\"*\"": {
|
|
@@ -96,29 +132,15 @@ export type DBSchemaGenerated = {
|
|
|
96
132
|
name?: null | string;
|
|
97
133
|
};
|
|
98
134
|
};
|
|
99
|
-
|
|
100
|
-
is_view: false;
|
|
101
|
-
select: true;
|
|
102
|
-
insert: true;
|
|
103
|
-
update: true;
|
|
104
|
-
delete: true;
|
|
105
|
-
columns: {
|
|
106
|
-
id: number;
|
|
107
|
-
id_basic: number | null;
|
|
108
|
-
txt: string | null;
|
|
109
|
-
};
|
|
110
|
-
};
|
|
111
|
-
self_join: {
|
|
135
|
+
items_m1: {
|
|
112
136
|
is_view: false;
|
|
113
137
|
select: true;
|
|
114
138
|
insert: true;
|
|
115
139
|
update: true;
|
|
116
140
|
delete: true;
|
|
117
141
|
columns: {
|
|
118
|
-
id
|
|
119
|
-
name: string
|
|
120
|
-
my_id: number | null;
|
|
121
|
-
my_id1: number | null;
|
|
142
|
+
id?: number;
|
|
143
|
+
name: string;
|
|
122
144
|
};
|
|
123
145
|
};
|
|
124
146
|
items_multi: {
|
|
@@ -267,6 +289,16 @@ export type DBSchemaGenerated = {
|
|
|
267
289
|
obj?: null | any;
|
|
268
290
|
};
|
|
269
291
|
};
|
|
292
|
+
pg_attribute: {
|
|
293
|
+
is_view: false;
|
|
294
|
+
select: true;
|
|
295
|
+
insert: true;
|
|
296
|
+
update: true;
|
|
297
|
+
delete: true;
|
|
298
|
+
columns: {
|
|
299
|
+
id?: number;
|
|
300
|
+
};
|
|
301
|
+
};
|
|
270
302
|
planes: {
|
|
271
303
|
is_view: false;
|
|
272
304
|
select: true;
|
|
@@ -303,6 +335,17 @@ export type DBSchemaGenerated = {
|
|
|
303
335
|
media_id: string;
|
|
304
336
|
};
|
|
305
337
|
};
|
|
338
|
+
prostgles_lookup_media_various: {
|
|
339
|
+
is_view: false;
|
|
340
|
+
select: true;
|
|
341
|
+
insert: true;
|
|
342
|
+
update: true;
|
|
343
|
+
delete: true;
|
|
344
|
+
columns: {
|
|
345
|
+
foreign_id: number;
|
|
346
|
+
media_id: string;
|
|
347
|
+
};
|
|
348
|
+
};
|
|
306
349
|
"prostgles_test.basic": {
|
|
307
350
|
is_view: false;
|
|
308
351
|
select: true;
|
|
@@ -326,6 +369,31 @@ export type DBSchemaGenerated = {
|
|
|
326
369
|
txt?: null | string;
|
|
327
370
|
};
|
|
328
371
|
};
|
|
372
|
+
"prostgles_test.mv_basic1": {
|
|
373
|
+
is_view: true;
|
|
374
|
+
select: true;
|
|
375
|
+
insert: false;
|
|
376
|
+
update: false;
|
|
377
|
+
delete: false;
|
|
378
|
+
columns: {
|
|
379
|
+
id: number;
|
|
380
|
+
id_basic: number;
|
|
381
|
+
txt: string;
|
|
382
|
+
};
|
|
383
|
+
};
|
|
384
|
+
"prostgles_test.self_join": {
|
|
385
|
+
is_view: false;
|
|
386
|
+
select: true;
|
|
387
|
+
insert: true;
|
|
388
|
+
update: true;
|
|
389
|
+
delete: true;
|
|
390
|
+
columns: {
|
|
391
|
+
id?: number;
|
|
392
|
+
my_id?: null | number;
|
|
393
|
+
my_id1?: null | number;
|
|
394
|
+
name?: null | string;
|
|
395
|
+
};
|
|
396
|
+
};
|
|
329
397
|
rec: {
|
|
330
398
|
is_view: false;
|
|
331
399
|
select: true;
|
|
@@ -348,6 +416,19 @@ export type DBSchemaGenerated = {
|
|
|
348
416
|
id?: number;
|
|
349
417
|
};
|
|
350
418
|
};
|
|
419
|
+
self_join: {
|
|
420
|
+
is_view: false;
|
|
421
|
+
select: true;
|
|
422
|
+
insert: true;
|
|
423
|
+
update: true;
|
|
424
|
+
delete: true;
|
|
425
|
+
columns: {
|
|
426
|
+
id?: number;
|
|
427
|
+
my_id?: null | number;
|
|
428
|
+
my_id1?: null | number;
|
|
429
|
+
name?: null | string;
|
|
430
|
+
};
|
|
431
|
+
};
|
|
351
432
|
shapes: {
|
|
352
433
|
is_view: false;
|
|
353
434
|
select: true;
|
|
@@ -472,5 +553,16 @@ export type DBSchemaGenerated = {
|
|
|
472
553
|
tsv?: null | string;
|
|
473
554
|
};
|
|
474
555
|
};
|
|
556
|
+
various_nested: {
|
|
557
|
+
is_view: false;
|
|
558
|
+
select: true;
|
|
559
|
+
insert: true;
|
|
560
|
+
update: true;
|
|
561
|
+
delete: true;
|
|
562
|
+
columns: {
|
|
563
|
+
name?: null | string;
|
|
564
|
+
various_id?: null | number;
|
|
565
|
+
};
|
|
566
|
+
};
|
|
475
567
|
|
|
476
568
|
}
|
package/tests/server/index.ts
CHANGED
|
@@ -226,7 +226,7 @@ function dd(){
|
|
|
226
226
|
dbConnection,
|
|
227
227
|
sqlFilePath: path.join(__dirname+'/../../init.sql'),
|
|
228
228
|
io,
|
|
229
|
-
tsGeneratedTypesDir: path.join(__dirname + '
|
|
229
|
+
tsGeneratedTypesDir: path.join(__dirname + '/../../'),
|
|
230
230
|
// watchSchema: true,
|
|
231
231
|
transactions: true,
|
|
232
232
|
schema: { public: 1, prostgles_test: 1 },
|
|
@@ -423,6 +423,9 @@ function dd(){
|
|
|
423
423
|
"prostgles_test.basic": "*",
|
|
424
424
|
"prostgles_test.basic1": "*",
|
|
425
425
|
"prostgles_test.mv_basic1": "*",
|
|
426
|
+
[`"""quoted0"""`]: "*",
|
|
427
|
+
[`"""quoted1"""`]: "*",
|
|
428
|
+
[`"""quoted2"""`]: "*",
|
|
426
429
|
};
|
|
427
430
|
|
|
428
431
|
return res;
|
package/tests/server/init.sql
CHANGED
|
@@ -160,6 +160,24 @@ CREATE TABLE IF NOT EXISTS """*""" (
|
|
|
160
160
|
|
|
161
161
|
DROP TABLE IF EXISTS hehe CASCADE;
|
|
162
162
|
|
|
163
|
+
DROP TABLE IF EXISTS """quoted0""" CASCADE;
|
|
164
|
+
DROP TABLE IF EXISTS """quoted1""" CASCADE;
|
|
165
|
+
DROP TABLE IF EXISTS """quoted2""" CASCADE;
|
|
166
|
+
CREATE TABLE IF NOT EXISTS """quoted2""" (
|
|
167
|
+
"""id2""" SERIAL PRIMARY KEY,
|
|
168
|
+
"""text_col2""" TEXT DEFAULT 'quoted2'
|
|
169
|
+
);
|
|
170
|
+
CREATE TABLE IF NOT EXISTS """quoted1""" (
|
|
171
|
+
"""id1""" SERIAL PRIMARY KEY,
|
|
172
|
+
"""quoted2_id""" INTEGER REFERENCES """quoted2""",
|
|
173
|
+
"""text_col1""" TEXT DEFAULT 'quoted1'
|
|
174
|
+
);
|
|
175
|
+
CREATE TABLE IF NOT EXISTS """quoted0""" (
|
|
176
|
+
"""id0""" SERIAL PRIMARY KEY,
|
|
177
|
+
"""quoted1_id""" INTEGER REFERENCES """quoted1""",
|
|
178
|
+
"""text_col0""" TEXT DEFAULT 'quoted0'
|
|
179
|
+
);
|
|
180
|
+
|
|
163
181
|
|
|
164
182
|
DROP TABLE IF EXISTS tr1 CASCADE;
|
|
165
183
|
CREATE TABLE IF NOT EXISTS tr1 (
|