prostgles-server 4.1.44 → 4.1.47
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/getSelectQuery.js +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts +3 -0
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js +13 -28
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +22 -6
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +1 -1
- package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +18 -33
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +23 -8
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/isomorphic_queries.ts +13 -0
- package/tests/server/package-lock.json +1 -1
|
@@ -30,7 +30,7 @@ function getSelectQuery(viewHandler, q, depth = 0, selectParamsGroupBy) {
|
|
|
30
30
|
* 1) prevent arrays with a single null element when no rows were matched
|
|
31
31
|
* 2) allow nested limit
|
|
32
32
|
* */
|
|
33
|
-
|
|
33
|
+
const joinAggNonNullArrayElemFilter = join.targetTableJoinFields
|
|
34
34
|
.map(f => `${joinAlias}.${(0, getJoinQuery_1.getJoinCol)(f).alias} IS NOT NULL`)
|
|
35
35
|
.concat(join.limitFieldName ? [`${(0, QueryBuilder_1.asNameAlias)(join.limitFieldName, joinAlias)} <= ${join.limit}`] : [])
|
|
36
36
|
.join(" AND ");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAC/C,qDAAoD;AACpD,iDAAuD;AAEvD,iDAA0D;AAE1D;;;KAGK;AACL,SAAgB,cAAc,CAC5B,WAAwB,EACxB,CAAW,EACX,KAAK,GAAG,CAAC,EACT,mBAA4B;IAG5B,MAAM,aAAa,GAAG,mBAAmB,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC;IAC/D,MAAM,cAAc,GAAG,4BAA4B,CAAC;IACpD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,IAAA,wBAAM,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7H,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,WAAW,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,mBAAmB,EAAE,aAAa,EAAE,CAAC,CAAC;QACjJ,OAAO;YACL,GAAG,EAAE;YACL,GAAG,MAAM;SACV,CAAA;IACH,CAAC,CAAC,IAAI,EAAE,CAAC;IAET,MAAM,KAAK,GAAG;QACV,UAAU,UAAU,CAAC,MAAM,CACzB,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACtB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,CAAA;YAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,0BAAW,EAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YACrG,gEAAgE;YAChE,MAAM,aAAa,GAAG,yBAAyB,cAAc,QAAQ,CAAC;YACtE;;;iBAGK;YACL,
|
|
1
|
+
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,5 +15,8 @@ export type ParsedJoinPath = {
|
|
|
15
15
|
* Return a valid join path
|
|
16
16
|
*/
|
|
17
17
|
export declare const parseJoinPath: ({ rawPath, rootTable, viewHandler, allowMultiOrJoin, addShortestJoinIfMissing }: parseJoinPathArgs) => ParsedJoinPath[];
|
|
18
|
+
export declare const reverseJoinOn: (on: ParsedJoinPath["on"]) => {
|
|
19
|
+
[k: string]: string;
|
|
20
|
+
}[];
|
|
18
21
|
export {};
|
|
19
22
|
//# sourceMappingURL=parseJoinPath.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAA;AACD,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,oFAA6F,iBAAiB,KAAG,cAAc,EA4CxJ,CAAA"}
|
|
1
|
+
{"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAA;AACD,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,oFAA6F,iBAAiB,KAAG,cAAc,EA4CxJ,CAAA;AA6HD,eAAO,MAAM,aAAa,OAAQ,cAAc,CAAC,IAAI,CAAC;;GASrD,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseJoinPath = void 0;
|
|
3
|
+
exports.reverseJoinOn = exports.parseJoinPath = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* Return a valid join path
|
|
6
6
|
*/
|
|
@@ -122,29 +122,8 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
122
122
|
throw `Joining ${t1} <-> ${tablePath} dissallowed or missing`;
|
|
123
123
|
}
|
|
124
124
|
const isLtr = join.tables[0] === t1;
|
|
125
|
-
const joinOn = isLtr ? join.on :
|
|
125
|
+
const joinOn = isLtr ? join.on : (0, exports.reverseJoinOn)(join.on);
|
|
126
126
|
const on = getValidOn(tablePath.on, joinOn);
|
|
127
|
-
// join.on.map(fullConstraint => {
|
|
128
|
-
// const condArr: [string, string][] = [];
|
|
129
|
-
// Object.entries(fullConstraint).forEach(([leftKey, rightKey]) => {
|
|
130
|
-
// const checkIfOnSpecified = (fields: [string, string], isLtr: boolean) => {
|
|
131
|
-
// if(tablePath.on){
|
|
132
|
-
// return tablePath.on.some(requestedConstraint => {
|
|
133
|
-
// const consFieldEntries = Object.entries(requestedConstraint)
|
|
134
|
-
// return consFieldEntries.every(consFields => (isLtr? consFields : consFields.slice(0).reverse()).join() === fields.join())
|
|
135
|
-
// });
|
|
136
|
-
// }
|
|
137
|
-
// return true;
|
|
138
|
-
// }
|
|
139
|
-
// /* Left table is joining on keys OR Left table is joining on values */
|
|
140
|
-
// const isLtr = join.tables[0] === t1;
|
|
141
|
-
// const fields: [string, string] = isLtr? [leftKey, rightKey] : [rightKey, leftKey];
|
|
142
|
-
// if(checkIfOnSpecified(fields, isLtr)){
|
|
143
|
-
// condArr.push(fields)
|
|
144
|
-
// }
|
|
145
|
-
// });
|
|
146
|
-
// on.push(condArr);
|
|
147
|
-
// })
|
|
148
127
|
paths.push({
|
|
149
128
|
source,
|
|
150
129
|
target,
|
|
@@ -172,6 +151,11 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
172
151
|
expectOne
|
|
173
152
|
};
|
|
174
153
|
}
|
|
154
|
+
const reverseJoinOn = (on) => {
|
|
155
|
+
return on.map(constraint => Object.fromEntries(Object.entries(constraint)
|
|
156
|
+
.map(([left, right]) => [right, left])));
|
|
157
|
+
};
|
|
158
|
+
exports.reverseJoinOn = reverseJoinOn;
|
|
175
159
|
const getValidOn = (requested, possible) => {
|
|
176
160
|
if (!requested) {
|
|
177
161
|
return possible.map(v => Object.entries(v));
|
|
@@ -180,15 +164,16 @@ const getValidOn = (requested, possible) => {
|
|
|
180
164
|
throw `Invalid requested "tablePath.on". Cannot be empty`;
|
|
181
165
|
}
|
|
182
166
|
const isValid = requested.every(requestedConstraint => {
|
|
183
|
-
|
|
184
|
-
return possible.some(fullConstraint => {
|
|
185
|
-
const fullConsFields = Object.entries(fullConstraint);
|
|
186
|
-
return fullConsFields.every(fullFields => requestedConsFields.every(requestedFields => requestedFields.join() === fullFields.join()));
|
|
187
|
-
});
|
|
167
|
+
return possible.some(possibleConstraint => conditionsMatch(possibleConstraint, requestedConstraint));
|
|
188
168
|
});
|
|
189
169
|
if (!isValid) {
|
|
190
170
|
throw `Invalid path specified for join: ${JSON.stringify(requested)}. Allowed paths: ${JSON.stringify(possible)}`;
|
|
191
171
|
}
|
|
192
172
|
return requested.map(v => Object.entries(v));
|
|
193
173
|
};
|
|
174
|
+
const conditionsMatch = (c1, c2) => {
|
|
175
|
+
const keys1 = Object.keys(c1);
|
|
176
|
+
const keys2 = Object.keys(c2);
|
|
177
|
+
return keys1.sort().join() === keys2.sort().join() && keys1.every(key => c1[key] === c2[key]);
|
|
178
|
+
};
|
|
194
179
|
//# sourceMappingURL=parseJoinPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSubscribeRelatedTables.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAwB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAO,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"getSubscribeRelatedTables.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAwB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAO,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,KAAK,IAAI,GAAG;IACV,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;IACpD,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;QAClB,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC9B,CAAC;CACH,CAAA;AACD,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,IAAI,gDAyKjJ"}
|
|
@@ -4,6 +4,7 @@ exports.getSubscribeRelatedTables = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
6
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
7
|
+
const parseJoinPath_1 = require("./ViewHandler/parseJoinPath");
|
|
7
8
|
async function getSubscribeRelatedTables({ selectParams, filter, localParams, table_rules, condition, filterOpts }) {
|
|
8
9
|
let viewOptions = undefined;
|
|
9
10
|
if (this.is_view) {
|
|
@@ -110,13 +111,17 @@ async function getSubscribeRelatedTables({ selectParams, filter, localParams, ta
|
|
|
110
111
|
const nonExistsFilter = filterOpts.exists.length ? {} : filter;
|
|
111
112
|
for await (const j of (newQuery.joins ?? [])) {
|
|
112
113
|
if (!viewOptions.relatedTables.find(rt => rt.tableName === j.table)) {
|
|
114
|
+
/**
|
|
115
|
+
* Must shift on condition
|
|
116
|
+
*/
|
|
113
117
|
viewOptions.relatedTables.push({
|
|
114
118
|
tableName: j.table,
|
|
115
119
|
tableNameEscaped: (0, prostgles_types_1.asName)(j.table),
|
|
116
120
|
condition: (await this.dboBuilder.dbo[j.table].prepareWhere({
|
|
117
121
|
filter: {
|
|
118
122
|
$existsJoined: {
|
|
119
|
-
|
|
123
|
+
path: reverseParsedPath(j.joinPath, this.name),
|
|
124
|
+
filter: nonExistsFilter
|
|
120
125
|
}
|
|
121
126
|
},
|
|
122
127
|
addKeywords: false,
|
|
@@ -129,14 +134,15 @@ async function getSubscribeRelatedTables({ selectParams, filter, localParams, ta
|
|
|
129
134
|
for await (const e of newQuery.whereOpts.exists.filter(e => e.isJoined)) {
|
|
130
135
|
if (!e.isJoined)
|
|
131
136
|
throw `Not possible`;
|
|
132
|
-
const
|
|
137
|
+
const targetTable = e.parsedPath.at(-1).table;
|
|
138
|
+
const newPath = reverseParsedPath(e.parsedPath, this.name);
|
|
133
139
|
viewOptions.relatedTables.push({
|
|
134
|
-
tableName:
|
|
135
|
-
tableNameEscaped: (0, prostgles_types_1.asName)(
|
|
136
|
-
condition: (await this.dboBuilder.dbo[
|
|
140
|
+
tableName: targetTable,
|
|
141
|
+
tableNameEscaped: (0, prostgles_types_1.asName)(targetTable),
|
|
142
|
+
condition: (await this.dboBuilder.dbo[targetTable].prepareWhere({
|
|
137
143
|
filter: {
|
|
138
144
|
$existsJoined: {
|
|
139
|
-
path:
|
|
145
|
+
path: newPath,
|
|
140
146
|
filter: nonExistsFilter
|
|
141
147
|
}
|
|
142
148
|
},
|
|
@@ -153,4 +159,14 @@ async function getSubscribeRelatedTables({ selectParams, filter, localParams, ta
|
|
|
153
159
|
return viewOptions;
|
|
154
160
|
}
|
|
155
161
|
exports.getSubscribeRelatedTables = getSubscribeRelatedTables;
|
|
162
|
+
const reverseParsedPath = (parsedPath, table) => {
|
|
163
|
+
const [targetTablePath, ...otherTables] = (parsedPath ?? []).slice(0).reverse();
|
|
164
|
+
if (!targetTablePath)
|
|
165
|
+
throw `Not possible`;
|
|
166
|
+
const newPath = [{
|
|
167
|
+
table,
|
|
168
|
+
on: (0, parseJoinPath_1.reverseJoinOn)(targetTablePath.on)
|
|
169
|
+
}, ...otherTables];
|
|
170
|
+
return newPath;
|
|
171
|
+
};
|
|
156
172
|
//# sourceMappingURL=getSubscribeRelatedTables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSubscribeRelatedTables.js","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":";;;AAAA,qDAAqE;AACrE,8CAA8F;AAE9F,kEAA8E;
|
|
1
|
+
{"version":3,"file":"getSubscribeRelatedTables.js","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ export function getSelectQuery(
|
|
|
39
39
|
* 1) prevent arrays with a single null element when no rows were matched
|
|
40
40
|
* 2) allow nested limit
|
|
41
41
|
* */
|
|
42
|
-
|
|
42
|
+
const joinAggNonNullArrayElemFilter = join.targetTableJoinFields
|
|
43
43
|
.map(f => `${joinAlias}.${getJoinCol(f).alias} IS NOT NULL`)
|
|
44
44
|
.concat(join.limitFieldName? [`${asNameAlias(join.limitFieldName, joinAlias)} <= ${join.limit}`] : [])
|
|
45
45
|
.join(" AND ");
|
|
@@ -149,36 +149,9 @@ function getJoins(viewHandler: ViewHandler, source: string, path: JoinPath[], {
|
|
|
149
149
|
throw `Joining ${t1} <-> ${tablePath} dissallowed or missing`;
|
|
150
150
|
}
|
|
151
151
|
const isLtr = join.tables[0] === t1;
|
|
152
|
-
const joinOn = isLtr? join.on : join.on
|
|
152
|
+
const joinOn = isLtr? join.on : reverseJoinOn(join.on);
|
|
153
153
|
|
|
154
154
|
const on = getValidOn(tablePath.on, joinOn);
|
|
155
|
-
|
|
156
|
-
// join.on.map(fullConstraint => {
|
|
157
|
-
// const condArr: [string, string][] = [];
|
|
158
|
-
// Object.entries(fullConstraint).forEach(([leftKey, rightKey]) => {
|
|
159
|
-
|
|
160
|
-
// const checkIfOnSpecified = (fields: [string, string], isLtr: boolean) => {
|
|
161
|
-
// if(tablePath.on){
|
|
162
|
-
// return tablePath.on.some(requestedConstraint => {
|
|
163
|
-
// const consFieldEntries = Object.entries(requestedConstraint)
|
|
164
|
-
|
|
165
|
-
// return consFieldEntries.every(consFields => (isLtr? consFields : consFields.slice(0).reverse()).join() === fields.join())
|
|
166
|
-
// });
|
|
167
|
-
// }
|
|
168
|
-
|
|
169
|
-
// return true;
|
|
170
|
-
// }
|
|
171
|
-
|
|
172
|
-
// /* Left table is joining on keys OR Left table is joining on values */
|
|
173
|
-
// const isLtr = join.tables[0] === t1;
|
|
174
|
-
// const fields: [string, string] = isLtr? [leftKey, rightKey] : [rightKey, leftKey];
|
|
175
|
-
// if(checkIfOnSpecified(fields, isLtr)){
|
|
176
|
-
// condArr.push(fields)
|
|
177
|
-
// }
|
|
178
|
-
// });
|
|
179
|
-
// on.push(condArr);
|
|
180
|
-
// })
|
|
181
|
-
|
|
182
155
|
paths.push({
|
|
183
156
|
source,
|
|
184
157
|
target,
|
|
@@ -209,6 +182,16 @@ function getJoins(viewHandler: ViewHandler, source: string, path: JoinPath[], {
|
|
|
209
182
|
};
|
|
210
183
|
}
|
|
211
184
|
|
|
185
|
+
export const reverseJoinOn = (on: ParsedJoinPath["on"]) => {
|
|
186
|
+
return on.map(constraint =>
|
|
187
|
+
Object.fromEntries(
|
|
188
|
+
Object.entries(constraint)
|
|
189
|
+
.map(([left, right]) =>
|
|
190
|
+
[right, left]
|
|
191
|
+
)
|
|
192
|
+
)
|
|
193
|
+
);
|
|
194
|
+
}
|
|
212
195
|
|
|
213
196
|
const getValidOn = (requested: JoinPath["on"], possible: ParsedJoinPath["on"]) => {
|
|
214
197
|
|
|
@@ -219,11 +202,7 @@ const getValidOn = (requested: JoinPath["on"], possible: ParsedJoinPath["on"]) =
|
|
|
219
202
|
throw `Invalid requested "tablePath.on". Cannot be empty`
|
|
220
203
|
}
|
|
221
204
|
const isValid = requested.every(requestedConstraint => {
|
|
222
|
-
|
|
223
|
-
return possible.some(fullConstraint => {
|
|
224
|
-
const fullConsFields = Object.entries(fullConstraint)
|
|
225
|
-
return fullConsFields.every(fullFields => requestedConsFields.every(requestedFields => requestedFields.join() === fullFields.join()))
|
|
226
|
-
})
|
|
205
|
+
return possible.some(possibleConstraint => conditionsMatch(possibleConstraint, requestedConstraint));
|
|
227
206
|
});
|
|
228
207
|
|
|
229
208
|
if(!isValid){
|
|
@@ -231,4 +210,10 @@ const getValidOn = (requested: JoinPath["on"], possible: ParsedJoinPath["on"]) =
|
|
|
231
210
|
}
|
|
232
211
|
|
|
233
212
|
return requested.map(v => Object.entries(v));
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
const conditionsMatch = (c1: Record<string, string>, c2: Record<string, string>) => {
|
|
216
|
+
const keys1 = Object.keys(c1);
|
|
217
|
+
const keys2 = Object.keys(c2);
|
|
218
|
+
return keys1.sort().join() === keys2.sort().join() && keys1.every(key => c1[key] === c2[key]);
|
|
234
219
|
}
|
|
@@ -4,6 +4,7 @@ import { TableRule } from "../PublishParser";
|
|
|
4
4
|
import { log, ViewSubscriptionOptions } from "../PubSubManager/PubSubManager";
|
|
5
5
|
import { NewQuery } from "./QueryBuilder/QueryBuilder";
|
|
6
6
|
import { ViewHandler } from "./ViewHandler/ViewHandler";
|
|
7
|
+
import { ParsedJoinPath, reverseJoinOn } from "./ViewHandler/parseJoinPath";
|
|
7
8
|
|
|
8
9
|
type Args = {
|
|
9
10
|
selectParams: Omit<SubscribeParams, "throttle">;
|
|
@@ -140,33 +141,37 @@ export async function getSubscribeRelatedTables(this: ViewHandler, { selectParam
|
|
|
140
141
|
const nonExistsFilter = filterOpts.exists.length ? {} : filter;
|
|
141
142
|
for await (const j of (newQuery.joins ?? [])) {
|
|
142
143
|
if (!viewOptions!.relatedTables.find(rt => rt.tableName === j.table)) {
|
|
144
|
+
/**
|
|
145
|
+
* Must shift on condition
|
|
146
|
+
*/
|
|
143
147
|
viewOptions.relatedTables.push({
|
|
144
148
|
tableName: j.table,
|
|
145
149
|
tableNameEscaped: asName(j.table),
|
|
146
150
|
condition: (await this.dboBuilder.dbo[j.table]!.prepareWhere!({
|
|
147
151
|
filter: {
|
|
148
152
|
$existsJoined: {
|
|
149
|
-
|
|
150
|
-
|
|
153
|
+
path: reverseParsedPath(j.joinPath, this.name),
|
|
154
|
+
filter: nonExistsFilter
|
|
151
155
|
}
|
|
152
156
|
},
|
|
153
157
|
addKeywords: false,
|
|
154
158
|
localParams: undefined,
|
|
155
159
|
tableRule: undefined
|
|
156
160
|
})).where
|
|
157
|
-
})
|
|
161
|
+
});
|
|
158
162
|
}
|
|
159
163
|
}
|
|
160
164
|
for await (const e of newQuery.whereOpts.exists.filter(e => e.isJoined)) {
|
|
161
165
|
if(!e.isJoined) throw `Not possible`;
|
|
162
|
-
const
|
|
166
|
+
const targetTable = e.parsedPath.at(-1)!.table;
|
|
167
|
+
const newPath = reverseParsedPath(e.parsedPath, this.name)
|
|
163
168
|
viewOptions.relatedTables.push({
|
|
164
|
-
tableName:
|
|
165
|
-
tableNameEscaped: asName(
|
|
166
|
-
condition: (await this.dboBuilder.dbo[
|
|
169
|
+
tableName: targetTable,
|
|
170
|
+
tableNameEscaped: asName(targetTable),
|
|
171
|
+
condition: (await this.dboBuilder.dbo[targetTable]!.prepareWhere!({
|
|
167
172
|
filter: {
|
|
168
173
|
$existsJoined: {
|
|
169
|
-
path:
|
|
174
|
+
path: newPath,
|
|
170
175
|
filter: nonExistsFilter
|
|
171
176
|
}
|
|
172
177
|
},
|
|
@@ -182,4 +187,14 @@ export async function getSubscribeRelatedTables(this: ViewHandler, { selectParam
|
|
|
182
187
|
}
|
|
183
188
|
|
|
184
189
|
return viewOptions;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
const reverseParsedPath = (parsedPath: ParsedJoinPath[], table: string) => {
|
|
193
|
+
const [targetTablePath, ...otherTables] = (parsedPath ?? []).slice(0).reverse();
|
|
194
|
+
if(!targetTablePath) throw `Not possible`;
|
|
195
|
+
const newPath: ParsedJoinPath[] = [{
|
|
196
|
+
table,
|
|
197
|
+
on: reverseJoinOn(targetTablePath.on)
|
|
198
|
+
}, ...otherTables]
|
|
199
|
+
return newPath;
|
|
185
200
|
}
|
package/package.json
CHANGED
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
4281
|
|
@@ -890,6 +890,19 @@ export default async function isomorphic(db: Required<DBHandlerServer> | Require
|
|
|
890
890
|
assert.deepStrictEqual(reverseJoin[1], { "id": 2, "tr1_id": 2, "t1": "a", "t2": "b", "tr1": [{ "ids": [2] }] });
|
|
891
891
|
});
|
|
892
892
|
|
|
893
|
+
await tryRun("Related table subscribe", async () => {
|
|
894
|
+
const sub = await await db.tr1.subscribe!({}, {
|
|
895
|
+
select: {
|
|
896
|
+
"*": 1,
|
|
897
|
+
tr2: "*"
|
|
898
|
+
}
|
|
899
|
+
}, rows => {
|
|
900
|
+
|
|
901
|
+
});
|
|
902
|
+
|
|
903
|
+
await sub.unsubscribe();
|
|
904
|
+
});
|
|
905
|
+
|
|
893
906
|
await tryRun("Reference column deep nested insert", async () => {
|
|
894
907
|
|
|
895
908
|
const pr = await db.items4a.insert!({
|