prostgles-server 4.2.612 → 4.2.613
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/DboBuilder.d.ts +1 -1
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +1 -1
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/joins/getInferredJoins.d.ts +4 -0
- package/dist/DboBuilder/joins/getInferredJoins.d.ts.map +1 -0
- package/dist/DboBuilder/joins/getInferredJoins.js +55 -0
- package/dist/DboBuilder/joins/getInferredJoins.js.map +1 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.d.ts +12 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.d.ts.map +1 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.js +165 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.js.map +1 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.spec.d.ts.map +1 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.spec.js +67 -0
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.spec.js.map +1 -0
- package/dist/DboBuilder/joins/shortestPath.d.ts.map +1 -0
- package/dist/{shortestPath.js → DboBuilder/joins/shortestPath.js} +11 -11
- package/dist/DboBuilder/joins/shortestPath.js.map +1 -0
- package/dist/ProstglesTypes.d.ts +4 -3
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/utils/utils.d.ts +1 -0
- package/dist/utils/utils.d.ts.map +1 -1
- package/dist/utils/utils.js +8 -3
- package/dist/utils/utils.js.map +1 -1
- package/lib/DboBuilder/DboBuilder.ts +13 -10
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +1 -1
- package/lib/DboBuilder/joins/getInferredJoins.ts +59 -0
- package/lib/DboBuilder/joins/prepareShortestJoinPaths.spec.ts +72 -0
- package/lib/DboBuilder/joins/prepareShortestJoinPaths.ts +205 -0
- package/lib/{shortestPath.ts → DboBuilder/joins/shortestPath.ts} +14 -13
- package/lib/ProstglesTypes.ts +4 -3
- package/lib/utils/utils.ts +6 -0
- package/package.json +1 -1
- package/tsconfig.json +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.d.ts +0 -12
- package/dist/DboBuilder/prepareShortestJoinPaths.d.ts.map +0 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.js +0 -186
- package/dist/DboBuilder/prepareShortestJoinPaths.js.map +0 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.spec.d.ts.map +0 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.spec.js +0 -30
- package/dist/DboBuilder/prepareShortestJoinPaths.spec.js.map +0 -1
- package/dist/shortestPath.d.ts.map +0 -1
- package/dist/shortestPath.js.map +0 -1
- package/lib/DboBuilder/prepareShortestJoinPaths.spec.ts +0 -29
- package/lib/DboBuilder/prepareShortestJoinPaths.ts +0 -225
- /package/dist/DboBuilder/{prepareShortestJoinPaths.spec.d.ts → joins/prepareShortestJoinPaths.spec.d.ts} +0 -0
- /package/dist/{shortestPath.d.ts → DboBuilder/joins/shortestPath.d.ts} +0 -0
|
@@ -1,186 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.prepareShortestJoinPaths = prepareShortestJoinPaths;
|
|
4
|
-
const ProstglesTypes_1 = require("../ProstglesTypes");
|
|
5
|
-
const shortestPath_1 = require("../shortestPath");
|
|
6
|
-
async function prepareShortestJoinPaths(dboBuilder) {
|
|
7
|
-
if (dboBuilder.prostgles.opts.joins) {
|
|
8
|
-
let joinConfig = await dboBuilder.prostgles.opts.joins;
|
|
9
|
-
if (!dboBuilder.tablesOrViews) {
|
|
10
|
-
throw new Error("Could not create join config. this.tablesOrViews missing");
|
|
11
|
-
}
|
|
12
|
-
// The initial DBO is needed by tableConfig before its tables/columns exist.
|
|
13
|
-
// Defer only joins that cannot be resolved yet; the final rebuild validates all.
|
|
14
|
-
if (Array.isArray(joinConfig) && dboBuilder.prostgles.preparingTableConfig) {
|
|
15
|
-
const tables = dboBuilder.tablesOrViews;
|
|
16
|
-
joinConfig = joinConfig.filter((join) => join.tables.every((name, index) => {
|
|
17
|
-
const table = tables.find((candidate) => candidate.name === name);
|
|
18
|
-
return table && join.on.every((on) => (index === 0 ? Object.keys(on) : Object.values(on)).every((column) => table.columns.some((candidate) => candidate.name === column)));
|
|
19
|
-
}));
|
|
20
|
-
}
|
|
21
|
-
const inferredJoins = await getInferredJoins2(dboBuilder.tablesOrViews);
|
|
22
|
-
if (joinConfig === "inferred") {
|
|
23
|
-
joinConfig = inferredJoins;
|
|
24
|
-
/* If joins are specified then include inferred joins except the explicit tables */
|
|
25
|
-
}
|
|
26
|
-
else if (Array.isArray(joinConfig)) {
|
|
27
|
-
const joinTables = joinConfig.map((j) => j.tables).flat();
|
|
28
|
-
joinConfig = joinConfig.concat(inferredJoins.filter((j) => !j.tables.find((t) => joinTables.includes(t))));
|
|
29
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
30
|
-
}
|
|
31
|
-
else if (joinConfig) {
|
|
32
|
-
throw new Error("Unexpected joins init param. Expecting 'inferred' OR joinConfig but got: " +
|
|
33
|
-
JSON.stringify(joinConfig));
|
|
34
|
-
}
|
|
35
|
-
const joins = JSON.parse(JSON.stringify(joinConfig));
|
|
36
|
-
// Validate joins
|
|
37
|
-
try {
|
|
38
|
-
const tovNames = dboBuilder.tablesOrViews.map((t) => t.name);
|
|
39
|
-
// 2 find incorrect tables
|
|
40
|
-
const missing = joins.flatMap((j) => j.tables).find((t) => !tovNames.includes(t));
|
|
41
|
-
if (missing) {
|
|
42
|
-
throw "Table not found: " + missing;
|
|
43
|
-
}
|
|
44
|
-
// 3 find incorrect fields
|
|
45
|
-
joins.map(({ tables, on }) => {
|
|
46
|
-
const t1 = tables[0], t2 = tables[1];
|
|
47
|
-
on.map((cond) => {
|
|
48
|
-
const f1s = Object.keys(cond), f2s = Object.values(cond);
|
|
49
|
-
[
|
|
50
|
-
[t1, f1s],
|
|
51
|
-
[t2, f2s],
|
|
52
|
-
].map((v) => {
|
|
53
|
-
const t = v[0], f = v[1];
|
|
54
|
-
const tov = dboBuilder.tablesOrViews.find((_t) => _t.name === t);
|
|
55
|
-
if (!tov)
|
|
56
|
-
throw "Table not found: " + t;
|
|
57
|
-
const m1 = f.filter((k) => !tov.columns.map((c) => c.name).includes(k));
|
|
58
|
-
if (m1.length) {
|
|
59
|
-
throw `Table ${t}(${tov.columns.map((c) => c.name).join()}) has no fields named: ${m1.join()}`;
|
|
60
|
-
}
|
|
61
|
-
});
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
|
-
// 4 find incorrect/missing join types
|
|
65
|
-
const expected_types = " \n\n-> Expecting: " + ProstglesTypes_1.JOIN_TYPES.map((t) => JSON.stringify(t)).join(` | `);
|
|
66
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
67
|
-
const mt = joins.find((j) => !j.type);
|
|
68
|
-
if (mt)
|
|
69
|
-
throw "Join type missing for: " + JSON.stringify(mt, null, 2) + expected_types;
|
|
70
|
-
const it = joins.find((j) => !ProstglesTypes_1.JOIN_TYPES.includes(j.type));
|
|
71
|
-
if (it)
|
|
72
|
-
throw "Incorrect join type for: " + JSON.stringify(it, null, 2) + expected_types;
|
|
73
|
-
}
|
|
74
|
-
catch (e) {
|
|
75
|
-
const errMsg = (joinConfig === "inferred" ? "INFERRED " : "") +
|
|
76
|
-
"JOINS VALIDATION ERROR \n-> " +
|
|
77
|
-
e;
|
|
78
|
-
throw errMsg;
|
|
79
|
-
}
|
|
80
|
-
// Make joins graph
|
|
81
|
-
const joinGraph = {};
|
|
82
|
-
joins.forEach(({ tables }) => {
|
|
83
|
-
const _t = tables.slice().sort(), t1 = _t[0], t2 = _t[1];
|
|
84
|
-
if (t1 === t2)
|
|
85
|
-
return;
|
|
86
|
-
joinGraph[t1] ??= {};
|
|
87
|
-
joinGraph[t1][t2] = 1;
|
|
88
|
-
joinGraph[t2] ??= {};
|
|
89
|
-
joinGraph[t2][t1] = 1;
|
|
90
|
-
});
|
|
91
|
-
const tables = Array.from(new Set(joins.flatMap((t) => t.tables)));
|
|
92
|
-
const shortestJoinPaths = [];
|
|
93
|
-
tables.forEach((t1) => {
|
|
94
|
-
tables.forEach((t2) => {
|
|
95
|
-
/** Prevent recursion */
|
|
96
|
-
if (t1 === t2 ||
|
|
97
|
-
shortestJoinPaths.some((jp) => {
|
|
98
|
-
if (arrayValuesMatch([jp.t1, jp.t2], [t1, t2])) {
|
|
99
|
-
const spath = (0, shortestPath_1.findShortestPath)(joinGraph, t1, t2);
|
|
100
|
-
if (arrayValuesMatch(spath.path, jp.path)) {
|
|
101
|
-
return true;
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
})) {
|
|
105
|
-
return;
|
|
106
|
-
}
|
|
107
|
-
const spath = (0, shortestPath_1.findShortestPath)(joinGraph, t1, t2);
|
|
108
|
-
if (!(spath.distance < Infinity))
|
|
109
|
-
return;
|
|
110
|
-
const existing1 = shortestJoinPaths.find((j) => j.t1 === t1 && j.t2 === t2);
|
|
111
|
-
if (!existing1) {
|
|
112
|
-
shortestJoinPaths.push({ t1, t2, path: spath.path.slice() });
|
|
113
|
-
}
|
|
114
|
-
const existing2 = shortestJoinPaths.find((j) => j.t2 === t1 && j.t1 === t2);
|
|
115
|
-
if (!existing2) {
|
|
116
|
-
shortestJoinPaths.push({
|
|
117
|
-
t1: t2,
|
|
118
|
-
t2: t1,
|
|
119
|
-
path: spath.path.slice().reverse(),
|
|
120
|
-
});
|
|
121
|
-
}
|
|
122
|
-
});
|
|
123
|
-
});
|
|
124
|
-
return {
|
|
125
|
-
joins,
|
|
126
|
-
shortestJoinPaths,
|
|
127
|
-
joinGraph,
|
|
128
|
-
};
|
|
129
|
-
}
|
|
130
|
-
return {
|
|
131
|
-
joins: [],
|
|
132
|
-
shortestJoinPaths: [],
|
|
133
|
-
};
|
|
134
|
-
}
|
|
135
|
-
const arrayValuesMatch = (arr1, arr2) => {
|
|
136
|
-
return arr1.slice().sort().join() === arr2.slice().sort().join();
|
|
137
|
-
};
|
|
138
|
-
function getInferredJoins2(schema) {
|
|
139
|
-
const joins = [];
|
|
140
|
-
const upsertJoin = (t1, t2, cols, type) => {
|
|
141
|
-
const existingIdx = joins.findIndex((j) => arrayValuesMatch(j.tables.slice(0), [t1, t2]));
|
|
142
|
-
const existing = joins[existingIdx];
|
|
143
|
-
const normalCond = cols.reduce((a, v) => ({ ...a, [v.col1]: v.col2 }), {});
|
|
144
|
-
const revertedCond = cols.reduce((a, v) => ({ ...a, [v.col2]: v.col1 }), {});
|
|
145
|
-
if (existing) {
|
|
146
|
-
const isLTR = existing.tables[0] === t1;
|
|
147
|
-
const cond = isLTR ? normalCond : revertedCond;
|
|
148
|
-
/** At some point we should add relationship type to EACH JOIN CONDITION GROUP */
|
|
149
|
-
// const fixedType = isLTR? type : type.split("").reverse().join("") as Join["type"];
|
|
150
|
-
/** Avoid duplicates */
|
|
151
|
-
if (!existing.on.some((_cond) => JSON.stringify(_cond) === JSON.stringify(cond))) {
|
|
152
|
-
existing.on.push(cond);
|
|
153
|
-
joins[existingIdx] = existing;
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
joins.push({
|
|
158
|
-
tables: [t1, t2],
|
|
159
|
-
on: [normalCond],
|
|
160
|
-
type,
|
|
161
|
-
});
|
|
162
|
-
}
|
|
163
|
-
};
|
|
164
|
-
schema.map((tov) => {
|
|
165
|
-
tov.columns.map((col) => {
|
|
166
|
-
if (col.references) {
|
|
167
|
-
col.references.forEach((r) => {
|
|
168
|
-
const joinCols = r.cols.map((c, i) => ({
|
|
169
|
-
col1: c,
|
|
170
|
-
col2: r.fcols[i],
|
|
171
|
-
}));
|
|
172
|
-
let type = "one-many";
|
|
173
|
-
const ftablePkeys = schema
|
|
174
|
-
.find((_tov) => _tov.name === r.ftable)
|
|
175
|
-
?.columns.filter((fcol) => fcol.is_pkey);
|
|
176
|
-
if (ftablePkeys?.length && ftablePkeys.every((fkey) => r.fcols.includes(fkey.name))) {
|
|
177
|
-
type = "one-one";
|
|
178
|
-
}
|
|
179
|
-
upsertJoin(tov.name, r.ftable, joinCols, type);
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
});
|
|
183
|
-
});
|
|
184
|
-
return joins;
|
|
185
|
-
}
|
|
186
|
-
//# sourceMappingURL=prepareShortestJoinPaths.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"prepareShortestJoinPaths.js","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"prepareShortestJoinPaths.spec.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const strict_1 = __importDefault(require("node:assert/strict"));
|
|
7
|
-
const node_test_1 = __importDefault(require("node:test"));
|
|
8
|
-
const prepareShortestJoinPaths_1 = require("./prepareShortestJoinPaths");
|
|
9
|
-
void (0, node_test_1.default)("configured joins are deferred only during table configuration", async () => {
|
|
10
|
-
const builder = {
|
|
11
|
-
prostgles: { preparingTableConfig: true, opts: { joins: [
|
|
12
|
-
{ tables: ["conditions", "members"], on: [{ project_id: "project_id" }], type: "many-many" },
|
|
13
|
-
] } },
|
|
14
|
-
tablesOrViews: [],
|
|
15
|
-
};
|
|
16
|
-
strict_1.default.deepEqual((await (0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder)).joins, []);
|
|
17
|
-
builder.prostgles.preparingTableConfig = false;
|
|
18
|
-
await strict_1.default.rejects((0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder), (error) => typeof error === "string" && error.includes("Table not found: conditions"));
|
|
19
|
-
});
|
|
20
|
-
void (0, node_test_1.default)("existing configured joins remain available during table configuration", async () => {
|
|
21
|
-
const join = { tables: ["conditions", "members"], on: [{ project_id: "project_id" }], type: "many-many" };
|
|
22
|
-
const builder = {
|
|
23
|
-
prostgles: { preparingTableConfig: true, opts: { joins: [join] } },
|
|
24
|
-
tablesOrViews: ["conditions", "members"].map((name) => ({ name, columns: [{ name: "project_id" }] })),
|
|
25
|
-
};
|
|
26
|
-
strict_1.default.deepEqual((await (0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder)).joins, [join]);
|
|
27
|
-
builder.prostgles.preparingTableConfig = false;
|
|
28
|
-
strict_1.default.deepEqual((await (0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder)).joins, [join]);
|
|
29
|
-
});
|
|
30
|
-
//# sourceMappingURL=prepareShortestJoinPaths.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"prepareShortestJoinPaths.spec.js","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.spec.ts"],"names":[],"mappings":";;;;;AAAA,gEAAwC;AACxC,0DAA6B;AAE7B,yEAAsE;AAEtE,KAAK,IAAA,mBAAI,EAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IACpF,MAAM,OAAO,GAAG;QACd,SAAS,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE;oBACtD,EAAE,MAAM,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE;iBAC7F,EAAE,EAAE;QACL,aAAa,EAAE,EAAE;KACO,CAAC;IAC3B,gBAAM,CAAC,SAAS,CAAC,CAAC,MAAM,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtE,OAAO,CAAC,SAAS,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAC/C,MAAM,gBAAM,CAAC,OAAO,CAAC,IAAA,mDAAwB,EAAC,OAAO,CAAC,EAAE,CAAC,KAAc,EAAE,EAAE,CACzE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAC3E,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,mBAAI,EAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;IAC5F,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC1G,MAAM,OAAO,GAAG;QACd,SAAS,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;QAClE,aAAa,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;KAC7E,CAAC;IAC3B,gBAAM,CAAC,SAAS,CAAC,CAAC,MAAM,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,SAAS,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAC/C,gBAAM,CAAC,SAAS,CAAC,CAAC,MAAM,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"shortestPath.d.ts","sourceRoot":"","sources":["../lib/shortestPath.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,KAAK,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,KAAK,EACZ,WAAW,MAAM,EACjB,SAAS,MAAM,KACd;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAgEpC,CAAC"}
|
package/dist/shortestPath.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"shortestPath.js","sourceRoot":"","sources":["../lib/shortestPath.ts"],"names":[],"mappings":";;;AAIA,MAAM,oBAAoB,GAAG,CAAC,SAAgB,EAAE,OAAc,EAAE,EAAE;IAChE,IAAI,QAAQ,GAAG,IAAI,CAAC;IAEpB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,iBAAiB,GAAG,QAAQ,KAAK,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QACrF,IAAI,iBAAiB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAKK,MAAM,gBAAgB,GAAG,CAC9B,KAAY,EACZ,SAAiB,EACjB,OAAe,EACuB,EAAE;IACxC,+DAA+D;IAC/D,IAAI,SAAS,GAAc,EAAE,CAAC;IAC9B,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;IAChC,SAAS,GAAG,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;IAElD,cAAc;IACd,MAAM,OAAO,GAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7C,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,6CAA6C;IAC7C,MAAM,OAAO,GAAc,EAAE,CAAC;IAE9B,wBAAwB;IACxB,IAAI,IAAI,GAAG,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEpD,gBAAgB;IAChB,OAAO,IAAI,EAAE,CAAC;QACZ,0DAA0D;QAC1D,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,gCAAgC;QAChC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,kDAAkD;YAClD,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxC,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,0DAA0D;gBAC1D,MAAM,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC/C,gGAAgG;gBAChG,mHAAmH;gBACnH,kCAAkC;gBAClC,kBAAkB;gBAClB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,WAAW,EAAE,CAAC;oBACxD,SAAS,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;oBAC/B,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;gBACxB,CAAC;YACH,CAAC;QACH,CAAC;QACD,mCAAmC;QACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,oCAAoC;QACpC,IAAI,GAAG,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,qDAAqD;IACrD,2BAA2B;IAC3B,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,MAAM,EAAE,CAAC;QACd,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IACD,YAAY,CAAC,OAAO,EAAE,CAAC;IAEvB,sEAAsE;IACtE,MAAM,OAAO,GAAG;QACd,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC;QAC5B,IAAI,EAAE,YAAY;KACnB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AApEW,QAAA,gBAAgB,oBAoE3B;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCE"}
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import assert from "node:assert/strict";
|
|
2
|
-
import test from "node:test";
|
|
3
|
-
import type { DboBuilder } from "./DboBuilder";
|
|
4
|
-
import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
|
|
5
|
-
|
|
6
|
-
void test("configured joins are deferred only during table configuration", async () => {
|
|
7
|
-
const builder = {
|
|
8
|
-
prostgles: { preparingTableConfig: true, opts: { joins: [
|
|
9
|
-
{ tables: ["conditions", "members"], on: [{ project_id: "project_id" }], type: "many-many" },
|
|
10
|
-
] } },
|
|
11
|
-
tablesOrViews: [],
|
|
12
|
-
} as unknown as DboBuilder;
|
|
13
|
-
assert.deepEqual((await prepareShortestJoinPaths(builder)).joins, []);
|
|
14
|
-
builder.prostgles.preparingTableConfig = false;
|
|
15
|
-
await assert.rejects(prepareShortestJoinPaths(builder), (error: unknown) =>
|
|
16
|
-
typeof error === "string" && error.includes("Table not found: conditions")
|
|
17
|
-
);
|
|
18
|
-
});
|
|
19
|
-
|
|
20
|
-
void test("existing configured joins remain available during table configuration", async () => {
|
|
21
|
-
const join = { tables: ["conditions", "members"], on: [{ project_id: "project_id" }], type: "many-many" };
|
|
22
|
-
const builder = {
|
|
23
|
-
prostgles: { preparingTableConfig: true, opts: { joins: [join] } },
|
|
24
|
-
tablesOrViews: ["conditions", "members"].map((name) => ({ name, columns: [{ name: "project_id" }] })),
|
|
25
|
-
} as unknown as DboBuilder;
|
|
26
|
-
assert.deepEqual((await prepareShortestJoinPaths(builder)).joins, [join]);
|
|
27
|
-
builder.prostgles.preparingTableConfig = false;
|
|
28
|
-
assert.deepEqual((await prepareShortestJoinPaths(builder)).joins, [join]);
|
|
29
|
-
});
|
|
@@ -1,225 +0,0 @@
|
|
|
1
|
-
import type { DboBuilder } from "../DboBuilder/DboBuilder";
|
|
2
|
-
import type { Join } from "../ProstglesTypes";
|
|
3
|
-
import { JOIN_TYPES } from "../ProstglesTypes";
|
|
4
|
-
import type { Graph} from "../shortestPath";
|
|
5
|
-
import { findShortestPath } from "../shortestPath";
|
|
6
|
-
import type { TableSchema } from "./DboBuilderTypes";
|
|
7
|
-
import type { JoinPaths } from "./ViewHandler/ViewHandler";
|
|
8
|
-
|
|
9
|
-
type Result = {
|
|
10
|
-
joinGraph?: Graph | undefined;
|
|
11
|
-
joins: Join[];
|
|
12
|
-
shortestJoinPaths: JoinPaths;
|
|
13
|
-
};
|
|
14
|
-
export async function prepareShortestJoinPaths(dboBuilder: DboBuilder): Promise<Result> {
|
|
15
|
-
if (dboBuilder.prostgles.opts.joins) {
|
|
16
|
-
let joinConfig = await dboBuilder.prostgles.opts.joins;
|
|
17
|
-
if (!dboBuilder.tablesOrViews) {
|
|
18
|
-
throw new Error("Could not create join config. this.tablesOrViews missing");
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
// The initial DBO is needed by tableConfig before its tables/columns exist.
|
|
22
|
-
// Defer only joins that cannot be resolved yet; the final rebuild validates all.
|
|
23
|
-
if (Array.isArray(joinConfig) && dboBuilder.prostgles.preparingTableConfig) {
|
|
24
|
-
const tables = dboBuilder.tablesOrViews;
|
|
25
|
-
joinConfig = joinConfig.filter((join) => join.tables.every((name, index) => {
|
|
26
|
-
const table = tables.find((candidate) => candidate.name === name);
|
|
27
|
-
return table && join.on.every((on) =>
|
|
28
|
-
(index === 0 ? Object.keys(on) : Object.values(on)).every((column) =>
|
|
29
|
-
table.columns.some((candidate) => candidate.name === column)
|
|
30
|
-
)
|
|
31
|
-
);
|
|
32
|
-
}));
|
|
33
|
-
}
|
|
34
|
-
const inferredJoins = await getInferredJoins2(dboBuilder.tablesOrViews);
|
|
35
|
-
if (joinConfig === "inferred") {
|
|
36
|
-
joinConfig = inferredJoins;
|
|
37
|
-
/* If joins are specified then include inferred joins except the explicit tables */
|
|
38
|
-
} else if (Array.isArray(joinConfig)) {
|
|
39
|
-
const joinTables = joinConfig.map((j) => j.tables).flat();
|
|
40
|
-
joinConfig = joinConfig.concat(
|
|
41
|
-
inferredJoins.filter((j) => !j.tables.find((t) => joinTables.includes(t)))
|
|
42
|
-
);
|
|
43
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
44
|
-
} else if (joinConfig) {
|
|
45
|
-
throw new Error(
|
|
46
|
-
"Unexpected joins init param. Expecting 'inferred' OR joinConfig but got: " +
|
|
47
|
-
JSON.stringify(joinConfig)
|
|
48
|
-
);
|
|
49
|
-
}
|
|
50
|
-
const joins = JSON.parse(JSON.stringify(joinConfig)) as Join[];
|
|
51
|
-
|
|
52
|
-
// Validate joins
|
|
53
|
-
try {
|
|
54
|
-
const tovNames = dboBuilder.tablesOrViews.map((t) => t.name);
|
|
55
|
-
|
|
56
|
-
// 2 find incorrect tables
|
|
57
|
-
const missing = joins.flatMap((j) => j.tables).find((t) => !tovNames.includes(t));
|
|
58
|
-
if (missing) {
|
|
59
|
-
throw "Table not found: " + missing;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
// 3 find incorrect fields
|
|
63
|
-
joins.map(({ tables, on }) => {
|
|
64
|
-
const t1 = tables[0],
|
|
65
|
-
t2 = tables[1];
|
|
66
|
-
on.map((cond) => {
|
|
67
|
-
const f1s = Object.keys(cond),
|
|
68
|
-
f2s = Object.values(cond);
|
|
69
|
-
[
|
|
70
|
-
[t1, f1s],
|
|
71
|
-
[t2, f2s],
|
|
72
|
-
].map((v) => {
|
|
73
|
-
const t = <string>v[0],
|
|
74
|
-
f = <string[]>v[1];
|
|
75
|
-
|
|
76
|
-
const tov = dboBuilder.tablesOrViews!.find((_t) => _t.name === t);
|
|
77
|
-
if (!tov) throw "Table not found: " + t;
|
|
78
|
-
const m1 = f.filter((k) => !tov.columns.map((c) => c.name).includes(k));
|
|
79
|
-
if (m1.length) {
|
|
80
|
-
throw `Table ${t}(${tov.columns.map((c) => c.name).join()}) has no fields named: ${m1.join()}`;
|
|
81
|
-
}
|
|
82
|
-
});
|
|
83
|
-
});
|
|
84
|
-
});
|
|
85
|
-
|
|
86
|
-
// 4 find incorrect/missing join types
|
|
87
|
-
const expected_types =
|
|
88
|
-
" \n\n-> Expecting: " + JOIN_TYPES.map((t) => JSON.stringify(t)).join(` | `);
|
|
89
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
90
|
-
const mt = joins.find((j) => !j.type);
|
|
91
|
-
if (mt) throw "Join type missing for: " + JSON.stringify(mt, null, 2) + expected_types;
|
|
92
|
-
|
|
93
|
-
const it = joins.find((j) => !JOIN_TYPES.includes(j.type));
|
|
94
|
-
if (it) throw "Incorrect join type for: " + JSON.stringify(it, null, 2) + expected_types;
|
|
95
|
-
} catch (e: any) {
|
|
96
|
-
const errMsg =
|
|
97
|
-
((joinConfig as any) === "inferred" ? "INFERRED " : "") +
|
|
98
|
-
"JOINS VALIDATION ERROR \n-> " +
|
|
99
|
-
e;
|
|
100
|
-
throw errMsg;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
// Make joins graph
|
|
104
|
-
const joinGraph: Graph = {};
|
|
105
|
-
joins.forEach(({ tables }) => {
|
|
106
|
-
const _t = tables.slice().sort(),
|
|
107
|
-
t1 = _t[0]!,
|
|
108
|
-
t2 = _t[1]!;
|
|
109
|
-
|
|
110
|
-
if (t1 === t2) return;
|
|
111
|
-
|
|
112
|
-
joinGraph[t1] ??= {};
|
|
113
|
-
joinGraph[t1][t2] = 1;
|
|
114
|
-
|
|
115
|
-
joinGraph[t2] ??= {};
|
|
116
|
-
joinGraph[t2][t1] = 1;
|
|
117
|
-
});
|
|
118
|
-
const tables = Array.from(new Set(joins.flatMap((t) => t.tables)));
|
|
119
|
-
const shortestJoinPaths: JoinPaths = [];
|
|
120
|
-
tables.forEach((t1) => {
|
|
121
|
-
tables.forEach((t2) => {
|
|
122
|
-
/** Prevent recursion */
|
|
123
|
-
if (
|
|
124
|
-
t1 === t2 ||
|
|
125
|
-
shortestJoinPaths.some((jp) => {
|
|
126
|
-
if (arrayValuesMatch([jp.t1, jp.t2], [t1, t2])) {
|
|
127
|
-
const spath = findShortestPath(joinGraph, t1, t2);
|
|
128
|
-
if (arrayValuesMatch(spath.path, jp.path)) {
|
|
129
|
-
return true;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
})
|
|
133
|
-
) {
|
|
134
|
-
return;
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
const spath = findShortestPath(joinGraph, t1, t2);
|
|
138
|
-
if (!(spath.distance < Infinity)) return;
|
|
139
|
-
|
|
140
|
-
const existing1 = shortestJoinPaths.find((j) => j.t1 === t1 && j.t2 === t2);
|
|
141
|
-
if (!existing1) {
|
|
142
|
-
shortestJoinPaths.push({ t1, t2, path: spath.path.slice() });
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
const existing2 = shortestJoinPaths.find((j) => j.t2 === t1 && j.t1 === t2);
|
|
146
|
-
if (!existing2) {
|
|
147
|
-
shortestJoinPaths.push({
|
|
148
|
-
t1: t2,
|
|
149
|
-
t2: t1,
|
|
150
|
-
path: spath.path.slice().reverse(),
|
|
151
|
-
});
|
|
152
|
-
}
|
|
153
|
-
});
|
|
154
|
-
});
|
|
155
|
-
return {
|
|
156
|
-
joins,
|
|
157
|
-
shortestJoinPaths,
|
|
158
|
-
joinGraph,
|
|
159
|
-
};
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
return {
|
|
163
|
-
joins: [],
|
|
164
|
-
shortestJoinPaths: [],
|
|
165
|
-
};
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
const arrayValuesMatch = <T>(arr1: T[], arr2: T[]): boolean => {
|
|
169
|
-
return arr1.slice().sort().join() === arr2.slice().sort().join();
|
|
170
|
-
};
|
|
171
|
-
|
|
172
|
-
function getInferredJoins2(schema: TableSchema[]): Join[] {
|
|
173
|
-
const joins: Join[] = [];
|
|
174
|
-
const upsertJoin = (
|
|
175
|
-
t1: string,
|
|
176
|
-
t2: string,
|
|
177
|
-
cols: { col1: string; col2: string }[],
|
|
178
|
-
type: Join["type"]
|
|
179
|
-
) => {
|
|
180
|
-
const existingIdx = joins.findIndex((j) => arrayValuesMatch(j.tables.slice(0), [t1, t2]));
|
|
181
|
-
const existing = joins[existingIdx];
|
|
182
|
-
const normalCond = cols.reduce((a, v) => ({ ...a, [v.col1]: v.col2 }), {});
|
|
183
|
-
const revertedCond = cols.reduce((a, v) => ({ ...a, [v.col2]: v.col1 }), {});
|
|
184
|
-
if (existing) {
|
|
185
|
-
const isLTR = existing.tables[0] === t1;
|
|
186
|
-
const cond = isLTR ? normalCond : revertedCond;
|
|
187
|
-
|
|
188
|
-
/** At some point we should add relationship type to EACH JOIN CONDITION GROUP */
|
|
189
|
-
// const fixedType = isLTR? type : type.split("").reverse().join("") as Join["type"];
|
|
190
|
-
|
|
191
|
-
/** Avoid duplicates */
|
|
192
|
-
if (!existing.on.some((_cond) => JSON.stringify(_cond) === JSON.stringify(cond))) {
|
|
193
|
-
existing.on.push(cond);
|
|
194
|
-
joins[existingIdx] = existing;
|
|
195
|
-
}
|
|
196
|
-
} else {
|
|
197
|
-
joins.push({
|
|
198
|
-
tables: [t1, t2],
|
|
199
|
-
on: [normalCond],
|
|
200
|
-
type,
|
|
201
|
-
});
|
|
202
|
-
}
|
|
203
|
-
};
|
|
204
|
-
schema.map((tov) => {
|
|
205
|
-
tov.columns.map((col) => {
|
|
206
|
-
if (col.references) {
|
|
207
|
-
col.references.forEach((r) => {
|
|
208
|
-
const joinCols = r.cols.map((c, i) => ({
|
|
209
|
-
col1: c,
|
|
210
|
-
col2: r.fcols[i]!,
|
|
211
|
-
}));
|
|
212
|
-
let type: Join["type"] = "one-many";
|
|
213
|
-
const ftablePkeys = schema
|
|
214
|
-
.find((_tov) => _tov.name === r.ftable)
|
|
215
|
-
?.columns.filter((fcol) => fcol.is_pkey);
|
|
216
|
-
if (ftablePkeys?.length && ftablePkeys.every((fkey) => r.fcols.includes(fkey.name))) {
|
|
217
|
-
type = "one-one";
|
|
218
|
-
}
|
|
219
|
-
upsertJoin(tov.name, r.ftable, joinCols, type);
|
|
220
|
-
});
|
|
221
|
-
}
|
|
222
|
-
});
|
|
223
|
-
});
|
|
224
|
-
return joins;
|
|
225
|
-
}
|
|
File without changes
|
|
File without changes
|