@entity-access/entity-access 1.0.95 → 1.0.97
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/.vscode/launch.json +3 -0
- package/dist/compiler/QueryCompiler.d.ts +2 -0
- package/dist/compiler/QueryCompiler.d.ts.map +1 -1
- package/dist/compiler/QueryCompiler.js +6 -0
- package/dist/compiler/QueryCompiler.js.map +1 -1
- package/dist/compiler/RawQuery.d.ts +10 -0
- package/dist/compiler/RawQuery.d.ts.map +1 -0
- package/dist/compiler/RawQuery.js +26 -0
- package/dist/compiler/RawQuery.js.map +1 -0
- package/dist/compiler/postgres/PostgreSqlMethodTransformer.d.ts.map +1 -1
- package/dist/compiler/postgres/PostgreSqlMethodTransformer.js +3 -0
- package/dist/compiler/postgres/PostgreSqlMethodTransformer.js.map +1 -1
- package/dist/compiler/sql-server/SqlServerSqlMethodTransformer.d.ts.map +1 -1
- package/dist/compiler/sql-server/SqlServerSqlMethodTransformer.js +9 -6
- package/dist/compiler/sql-server/SqlServerSqlMethodTransformer.js.map +1 -1
- package/dist/drivers/base/BaseDriver.d.ts +15 -8
- package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.js +13 -3
- package/dist/drivers/base/BaseDriver.js.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.d.ts +2 -12
- package/dist/drivers/postgres/PostgreSqlDriver.d.ts.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js +11 -2
- package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
- package/dist/drivers/sql-server/SqlServerDriver.d.ts +8 -2
- package/dist/drivers/sql-server/SqlServerDriver.d.ts.map +1 -1
- package/dist/drivers/sql-server/SqlServerDriver.js +18 -10
- package/dist/drivers/sql-server/SqlServerDriver.js.map +1 -1
- package/dist/eternity/ActivitySuspendedError.d.ts +3 -0
- package/dist/eternity/ActivitySuspendedError.d.ts.map +1 -1
- package/dist/eternity/ActivitySuspendedError.js +6 -0
- package/dist/eternity/ActivitySuspendedError.js.map +1 -1
- package/dist/eternity/EternityContext.d.ts +3 -1
- package/dist/eternity/EternityContext.d.ts.map +1 -1
- package/dist/eternity/EternityContext.js +59 -7
- package/dist/eternity/EternityContext.js.map +1 -1
- package/dist/eternity/EternityStorage.d.ts +6 -0
- package/dist/eternity/EternityStorage.d.ts.map +1 -1
- package/dist/eternity/EternityStorage.js +60 -19
- package/dist/eternity/EternityStorage.js.map +1 -1
- package/dist/eternity/Workflow.d.ts +15 -4
- package/dist/eternity/Workflow.d.ts.map +1 -1
- package/dist/eternity/Workflow.js +35 -22
- package/dist/eternity/Workflow.js.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts +3 -3
- package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js +2 -2
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.d.ts +3 -3
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.d.ts.map +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +2 -2
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
- package/dist/model/EntityContext.d.ts +3 -1
- package/dist/model/EntityContext.d.ts.map +1 -1
- package/dist/model/EntityContext.js +6 -2
- package/dist/model/EntityContext.js.map +1 -1
- package/dist/model/EntityQuery.js +3 -3
- package/dist/model/EntityQuery.js.map +1 -1
- package/dist/model/verification/VerificationSession.js +1 -1
- package/dist/model/verification/VerificationSession.js.map +1 -1
- package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.js +21 -19
- package/dist/query/ast/ExpressionToSql.js.map +1 -1
- package/dist/query/ast/Expressions.d.ts +1 -0
- package/dist/query/ast/Expressions.d.ts.map +1 -1
- package/dist/query/ast/Expressions.js +3 -0
- package/dist/query/ast/Expressions.js.map +1 -1
- package/dist/sql/ISql.d.ts +2 -0
- package/dist/sql/ISql.d.ts.map +1 -1
- package/dist/tests/drivers/postgres/connection-test.js +1 -1
- package/dist/tests/drivers/postgres/connection-test.js.map +1 -1
- package/dist/tests/eternity/child-tests.d.ts +3 -0
- package/dist/tests/eternity/child-tests.d.ts.map +1 -0
- package/dist/tests/eternity/child-tests.js +103 -0
- package/dist/tests/eternity/child-tests.js.map +1 -0
- package/dist/tests/eternity/eternity-tests.d.ts.map +1 -1
- package/dist/tests/eternity/eternity-tests.js.map +1 -1
- package/dist/tests/model/createContext.js +2 -2
- package/dist/tests/model/createContext.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/compiler/QueryCompiler.ts +7 -0
- package/src/compiler/RawQuery.ts +29 -0
- package/src/compiler/postgres/PostgreSqlMethodTransformer.ts +3 -0
- package/src/compiler/sql-server/SqlServerSqlMethodTransformer.ts +9 -6
- package/src/drivers/base/BaseDriver.ts +28 -10
- package/src/drivers/postgres/PostgreSqlDriver.ts +15 -2
- package/src/drivers/sql-server/SqlServerDriver.ts +21 -11
- package/src/eternity/ActivitySuspendedError.ts +8 -1
- package/src/eternity/EternityContext.ts +74 -7
- package/src/eternity/EternityStorage.ts +79 -19
- package/src/eternity/Workflow.ts +51 -11
- package/src/migrations/postgres/PostgresAutomaticMigrations.ts +5 -5
- package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +5 -5
- package/src/model/EntityContext.ts +9 -3
- package/src/model/EntityQuery.ts +3 -3
- package/src/model/verification/VerificationSession.ts +1 -1
- package/src/query/ast/ExpressionToSql.ts +22 -20
- package/src/query/ast/Expressions.ts +4 -0
- package/src/sql/ISql.ts +3 -0
- package/src/tests/drivers/postgres/connection-test.ts +1 -1
- package/src/tests/eternity/child-tests.ts +119 -0
- package/src/tests/eternity/eternity-tests.ts +1 -0
- package/src/tests/model/createContext.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EternityContext.d.ts","sourceRoot":"","sources":["../../src/eternity/EternityContext.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,eAAoC,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"EternityContext.d.ts","sourceRoot":"","sources":["../../src/eternity/EternityContext.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,eAAoC,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AA6G1C,MAAM,WAAW,eAAe,CAAC,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,OAAO,eAAe;IAQrB,OAAO,EAAE,eAAe;IANnC,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,QAAQ,CAA2C;gBAIhD,OAAO,EAAE,eAAe;IAK5B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAI3B,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW;IAiB1B,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAa9F,KAAK,CAAC,CAAC,EAChB,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC3B,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,EACjB,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAE;QAClC,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,GAAG,CAAC,EAAE,QAAQ,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAA;KACf;IAyCG,gBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW;IAc5C,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,KAAA,EAAE,KAAK,KAAA;YA6BzB,GAAG;CA0EpB"}
|
|
@@ -19,10 +19,11 @@ import EternityStorage from "./EternityStorage.js";
|
|
|
19
19
|
import { ActivitySuspendedError } from "./ActivitySuspendedError.js";
|
|
20
20
|
import { WorkflowRegistry } from "./WorkflowRegistry.js";
|
|
21
21
|
import crypto from "crypto";
|
|
22
|
+
import TimeSpan from "../types/TimeSpan.js";
|
|
22
23
|
import sleep from "../common/sleep.js";
|
|
23
24
|
async function hash(text) {
|
|
24
25
|
const sha256 = crypto.createHash("sha256");
|
|
25
|
-
return sha256.update(text).digest("
|
|
26
|
+
return sha256.update(text).digest("base64");
|
|
26
27
|
}
|
|
27
28
|
function bindStep(context, store, name, old, unique = false) {
|
|
28
29
|
return async function runStep(...a) {
|
|
@@ -42,6 +43,7 @@ function bindStep(context, store, name, old, unique = false) {
|
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
store.lastID = id;
|
|
46
|
+
let ttl = TimeSpan.fromSeconds(0);
|
|
45
47
|
const step = {
|
|
46
48
|
id,
|
|
47
49
|
parentID: this.id,
|
|
@@ -61,18 +63,22 @@ function bindStep(context, store, name, old, unique = false) {
|
|
|
61
63
|
const maxTS = a[0];
|
|
62
64
|
const eta = this.currentTime.add(maxTS);
|
|
63
65
|
step.eta = eta;
|
|
66
|
+
ttl = maxTS;
|
|
64
67
|
if (eta <= start) {
|
|
65
68
|
// time is up...
|
|
66
69
|
lastResult = "";
|
|
67
70
|
step.state = "done";
|
|
71
|
+
ttl = TimeSpan.fromSeconds(0);
|
|
68
72
|
}
|
|
69
73
|
}
|
|
70
74
|
else {
|
|
71
75
|
try {
|
|
72
76
|
const types = old[injectServiceKeysSymbol];
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
77
|
+
if (types) {
|
|
78
|
+
for (let index = a.length; index < types.length; index++) {
|
|
79
|
+
const element = ServiceProvider.resolve(this, types[index]);
|
|
80
|
+
a.push(element);
|
|
81
|
+
}
|
|
76
82
|
}
|
|
77
83
|
lastResult = (await old.apply(this, a)) ?? 0;
|
|
78
84
|
step.output = JSON.stringify(lastResult);
|
|
@@ -98,7 +104,7 @@ function bindStep(context, store, name, old, unique = false) {
|
|
|
98
104
|
throw lastError;
|
|
99
105
|
}
|
|
100
106
|
if (step.state !== "done") {
|
|
101
|
-
throw new ActivitySuspendedError();
|
|
107
|
+
throw new ActivitySuspendedError(ttl);
|
|
102
108
|
}
|
|
103
109
|
return lastResult;
|
|
104
110
|
};
|
|
@@ -142,7 +148,7 @@ let EternityContext = class EternityContext {
|
|
|
142
148
|
}
|
|
143
149
|
return null;
|
|
144
150
|
}
|
|
145
|
-
async queue(type, input, { id, throwIfExists, eta } = {}) {
|
|
151
|
+
async queue(type, input, { id, throwIfExists, eta, parentID } = {}) {
|
|
146
152
|
const clock = this.storage.clock;
|
|
147
153
|
if (id) {
|
|
148
154
|
const r = await this.storage.get(id);
|
|
@@ -171,6 +177,7 @@ let EternityContext = class EternityContext {
|
|
|
171
177
|
isWorkflow: true,
|
|
172
178
|
queued: now,
|
|
173
179
|
updated: now,
|
|
180
|
+
parentID,
|
|
174
181
|
eta
|
|
175
182
|
});
|
|
176
183
|
if (eta < clock.utcNow) {
|
|
@@ -191,6 +198,29 @@ let EternityContext = class EternityContext {
|
|
|
191
198
|
}
|
|
192
199
|
return pending.length;
|
|
193
200
|
}
|
|
201
|
+
async runChild(w, type, input) {
|
|
202
|
+
// there might still be some workflows pending
|
|
203
|
+
// this will ensure even empty workflow !!
|
|
204
|
+
const schema = WorkflowRegistry.register(type, void 0);
|
|
205
|
+
const inputID = JSON.stringify(input);
|
|
206
|
+
let id = w.id + `-child(${schema.name},${inputID})`;
|
|
207
|
+
if (id.length >= 200) {
|
|
208
|
+
id = w.id + `-child(${schema.name},${await hash(inputID)})`;
|
|
209
|
+
}
|
|
210
|
+
const result = await this.storage.get(id);
|
|
211
|
+
if (result) {
|
|
212
|
+
const { state } = result;
|
|
213
|
+
if (state === "done") {
|
|
214
|
+
return JSON.parse(result.output);
|
|
215
|
+
}
|
|
216
|
+
if (state === "failed") {
|
|
217
|
+
throw new Error(result.error);
|
|
218
|
+
}
|
|
219
|
+
throw new ActivitySuspendedError();
|
|
220
|
+
}
|
|
221
|
+
await this.queue(type, input, { id, parentID: w.id });
|
|
222
|
+
throw new ActivitySuspendedError();
|
|
223
|
+
}
|
|
194
224
|
async run(workflow) {
|
|
195
225
|
const clock = this.storage.clock;
|
|
196
226
|
if (workflow.state === "failed" || workflow.state === "done") {
|
|
@@ -205,7 +235,7 @@ let EternityContext = class EternityContext {
|
|
|
205
235
|
const schema = WorkflowRegistry.getByName(workflow.name);
|
|
206
236
|
const { eta, id, updated } = workflow;
|
|
207
237
|
const input = JSON.parse(workflow.input);
|
|
208
|
-
const instance = new (schema.type)({ input, eta, id, currentTime: DateTime.from(updated) });
|
|
238
|
+
const instance = new (schema.type)({ input, eta, id, currentTime: DateTime.from(updated) }, this);
|
|
209
239
|
for (const iterator of schema.activities) {
|
|
210
240
|
instance[iterator] = bindStep(this, workflow, iterator, instance[iterator]);
|
|
211
241
|
}
|
|
@@ -222,6 +252,9 @@ let EternityContext = class EternityContext {
|
|
|
222
252
|
catch (error) {
|
|
223
253
|
if (error instanceof ActivitySuspendedError) {
|
|
224
254
|
// this will update last id...
|
|
255
|
+
workflow.eta = clock.utcNow.add(error.ttl);
|
|
256
|
+
workflow.lockedTTL = null;
|
|
257
|
+
workflow.lockToken = null;
|
|
225
258
|
await this.storage.save(workflow);
|
|
226
259
|
return;
|
|
227
260
|
}
|
|
@@ -230,7 +263,26 @@ let EternityContext = class EternityContext {
|
|
|
230
263
|
workflow.state = "failed";
|
|
231
264
|
workflow.eta = clock.utcNow.add(instance.failedPreserveTime);
|
|
232
265
|
}
|
|
266
|
+
// in case of child workflow...
|
|
267
|
+
// eta will be set to one year...
|
|
268
|
+
if (workflow.parentID) {
|
|
269
|
+
workflow.eta = clock.utcNow.addYears(1);
|
|
270
|
+
// since we have finished.. we should
|
|
271
|
+
// make parent's eta approach now sooner..
|
|
272
|
+
}
|
|
273
|
+
workflow.lockedTTL = null;
|
|
274
|
+
workflow.lockToken = null;
|
|
233
275
|
await this.storage.save(workflow);
|
|
276
|
+
if (workflow.parentID) {
|
|
277
|
+
const parent = await this.storage.get(workflow.parentID);
|
|
278
|
+
if (parent) {
|
|
279
|
+
parent.lockTTL = null;
|
|
280
|
+
parent.lockToken = null;
|
|
281
|
+
parent.eta = clock.utcNow;
|
|
282
|
+
await this.storage.save(parent);
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
// workflow finished successfully...
|
|
234
286
|
}
|
|
235
287
|
finally {
|
|
236
288
|
scope.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EternityContext.js","sourceRoot":"","sources":["../../src/eternity/EternityContext.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAE/D,OAAO,MAAM,EAAE,EAAqB,eAAe,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,eAAoC,MAAM,sBAAsB,CAAC;AAExE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAmB,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"EternityContext.js","sourceRoot":"","sources":["../../src/eternity/EternityContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export declare class WorkflowStorage {
|
|
|
14
14
|
updated: DateTime;
|
|
15
15
|
priority: number;
|
|
16
16
|
lockedTTL: DateTime;
|
|
17
|
+
lockToken: string;
|
|
17
18
|
state: "queued" | "failed" | "done";
|
|
18
19
|
error: string;
|
|
19
20
|
extra: string;
|
|
@@ -23,8 +24,13 @@ export declare class WorkflowStorage {
|
|
|
23
24
|
export default class EternityStorage {
|
|
24
25
|
private driver;
|
|
25
26
|
readonly clock: WorkflowClock;
|
|
27
|
+
private lockQuery;
|
|
26
28
|
constructor(driver: BaseDriver, clock: WorkflowClock);
|
|
27
29
|
get(id: string, input?: any): Promise<{
|
|
30
|
+
id: string;
|
|
31
|
+
parentID: string;
|
|
32
|
+
lockTTL: DateTime;
|
|
33
|
+
lockToken: string;
|
|
28
34
|
updated: DateTime;
|
|
29
35
|
eta: DateTime;
|
|
30
36
|
queued: DateTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EternityStorage.d.ts","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"EternityStorage.d.ts","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,qBAWa,eAAe;IAGjB,EAAE,EAAE,MAAM,CAAC;IAGX,UAAU,EAAE,OAAO,CAAC;IAGpB,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;IAGd,MAAM,EAAE,MAAM,CAAC;IAGf,GAAG,EAAE,QAAQ,CAAC;IAGd,MAAM,EAAE,QAAQ,CAAC;IAGjB,OAAO,EAAE,QAAQ,CAAC;IAGlB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,QAAQ,CAAC;IAGpB,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IAGpC,KAAK,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,EAAE,MAAM,CAAC;CACzB;AAcD,MAAM,CAAC,OAAO,OAAO,eAAe;IAM5B,OAAO,CAAC,MAAM;aAEE,KAAK,EAAE,aAAa;IANxC,OAAO,CAAC,SAAS,CAAW;gBAIhB,MAAM,EAAE,UAAU,EAEV,KAAK,EAAE,aAAa;IAKlC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,KAAA;;;;;;;;;;;;IAoBtB,MAAM,CAAC,EAAE,KAAA;IAqBT,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;IAsBpC,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW;IAoE5B,IAAI;CAMb"}
|
|
@@ -10,12 +10,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
+
import { randomUUID } from "crypto";
|
|
13
14
|
import Column from "../decorators/Column.js";
|
|
14
15
|
import Index from "../decorators/Index.js";
|
|
15
16
|
import Table from "../decorators/Table.js";
|
|
16
17
|
import Inject, { RegisterScoped, RegisterSingleton } from "../di/di.js";
|
|
17
18
|
import { BaseDriver } from "../drivers/base/BaseDriver.js";
|
|
18
19
|
import EntityContext from "../model/EntityContext.js";
|
|
20
|
+
import { CallExpression, Expression, NullExpression, NumberLiteral, UpdateStatement } from "../query/ast/Expressions.js";
|
|
19
21
|
import DateTime from "../types/DateTime.js";
|
|
20
22
|
import WorkflowClock from "./WorkflowClock.js";
|
|
21
23
|
export let WorkflowStorage = class WorkflowStorage {
|
|
@@ -30,6 +32,7 @@ export let WorkflowStorage = class WorkflowStorage {
|
|
|
30
32
|
updated;
|
|
31
33
|
priority;
|
|
32
34
|
lockedTTL;
|
|
35
|
+
lockToken;
|
|
33
36
|
state;
|
|
34
37
|
error;
|
|
35
38
|
extra;
|
|
@@ -80,6 +83,10 @@ __decorate([
|
|
|
80
83
|
Column({ nullable: true }),
|
|
81
84
|
__metadata("design:type", DateTime)
|
|
82
85
|
], WorkflowStorage.prototype, "lockedTTL", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
Column({ nullable: true }),
|
|
88
|
+
__metadata("design:type", String)
|
|
89
|
+
], WorkflowStorage.prototype, "lockToken", void 0);
|
|
83
90
|
__decorate([
|
|
84
91
|
Column({ dataType: "AsciiChar", length: 10 }),
|
|
85
92
|
__metadata("design:type", String)
|
|
@@ -124,6 +131,7 @@ WorkflowContext = __decorate([
|
|
|
124
131
|
let EternityStorage = class EternityStorage {
|
|
125
132
|
driver;
|
|
126
133
|
clock;
|
|
134
|
+
lockQuery;
|
|
127
135
|
constructor(driver, clock) {
|
|
128
136
|
this.driver = driver;
|
|
129
137
|
this.clock = clock;
|
|
@@ -133,6 +141,10 @@ let EternityStorage = class EternityStorage {
|
|
|
133
141
|
const r = await db.workflows.where({ id }, (p) => (x) => x.id === p.id && x.isWorkflow === true).first();
|
|
134
142
|
if (r !== null) {
|
|
135
143
|
return {
|
|
144
|
+
id,
|
|
145
|
+
parentID: r.parentID,
|
|
146
|
+
lockTTL: r.lockedTTL,
|
|
147
|
+
lockToken: r.lockToken,
|
|
136
148
|
updated: r.updated,
|
|
137
149
|
eta: r.eta,
|
|
138
150
|
queued: r.queued,
|
|
@@ -164,7 +176,8 @@ let EternityStorage = class EternityStorage {
|
|
|
164
176
|
}
|
|
165
177
|
async save(state) {
|
|
166
178
|
const db = new WorkflowContext(this.driver);
|
|
167
|
-
|
|
179
|
+
const connection = db.connection;
|
|
180
|
+
await connection.runInTransaction(async () => {
|
|
168
181
|
let w = await db.workflows.where(state, (p) => (x) => x.id === p.id).first();
|
|
169
182
|
if (!w) {
|
|
170
183
|
w = db.workflows.add(state);
|
|
@@ -176,34 +189,62 @@ let EternityStorage = class EternityStorage {
|
|
|
176
189
|
}
|
|
177
190
|
}
|
|
178
191
|
w.state ||= "queued";
|
|
192
|
+
w.updated = DateTime.utcNow;
|
|
179
193
|
await db.saveChanges();
|
|
180
194
|
});
|
|
181
195
|
}
|
|
182
196
|
async dequeue(signal) {
|
|
183
197
|
const db = new WorkflowContext(this.driver);
|
|
184
198
|
const now = this.clock.utcNow;
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
const
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
.
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
199
|
+
if (!this.lockQuery) {
|
|
200
|
+
const type = db.model.getEntityType(WorkflowStorage);
|
|
201
|
+
const px = Expression.parameter("x");
|
|
202
|
+
const lockTokenField = type.getProperty("lockToken").field.columnName;
|
|
203
|
+
const lockTTLField = type.getProperty("lockedTTL").field.columnName;
|
|
204
|
+
const exp = UpdateStatement.create({
|
|
205
|
+
table: type.fullyQualifiedName,
|
|
206
|
+
set: [
|
|
207
|
+
Expression.assign(Expression.identifier(lockTokenField), Expression.member(px, "lockToken")),
|
|
208
|
+
Expression.assign(Expression.identifier(lockTTLField), CallExpression.create({
|
|
209
|
+
callee: Expression.member(Expression.member(Expression.identifier("Sql"), "date"), "addMinutes"),
|
|
210
|
+
arguments: [CallExpression.create({
|
|
211
|
+
callee: Expression.member(Expression.member(Expression.identifier("Sql"), "date"), "now")
|
|
212
|
+
}),
|
|
213
|
+
NumberLiteral.create({ value: 5 })
|
|
214
|
+
]
|
|
215
|
+
}))
|
|
216
|
+
],
|
|
217
|
+
where: Expression.logicalAnd(Expression.equal(Expression.identifier("id"), Expression.member(px, "id")), Expression.equal(Expression.identifier(lockTokenField), NullExpression.create({})))
|
|
218
|
+
});
|
|
219
|
+
this.lockQuery = this.driver.compiler.compileToRawQuery(null, exp, px);
|
|
220
|
+
}
|
|
221
|
+
const q = this.lockQuery;
|
|
222
|
+
const items = await db.workflows
|
|
223
|
+
.where({ now }, (p) => (x) => x.eta <= p.now
|
|
224
|
+
&& (x.lockedTTL === null || x.lockedTTL <= p.now)
|
|
225
|
+
&& x.lockToken === null
|
|
226
|
+
&& x.isWorkflow === true)
|
|
227
|
+
.orderBy({}, (p) => (x) => x.eta)
|
|
228
|
+
.thenBy({}, (p) => (x) => x.priority)
|
|
229
|
+
.limit(20)
|
|
230
|
+
.withSignal(signal)
|
|
231
|
+
.toArray();
|
|
232
|
+
const list = [];
|
|
233
|
+
const uuid = randomUUID();
|
|
234
|
+
for (const iterator of items) {
|
|
235
|
+
// try to acquire lock...
|
|
236
|
+
iterator.lockToken = uuid;
|
|
237
|
+
const r = await q.invoke(db.connection, iterator);
|
|
238
|
+
if (r.updated > 0) {
|
|
239
|
+
list.push(iterator);
|
|
198
240
|
}
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
});
|
|
241
|
+
}
|
|
242
|
+
return list;
|
|
202
243
|
}
|
|
203
244
|
async seed() {
|
|
204
245
|
const db = new WorkflowContext(this.driver);
|
|
205
|
-
await db.
|
|
206
|
-
await db.
|
|
246
|
+
await db.connection.ensureDatabase();
|
|
247
|
+
await db.connection.automaticMigrations().migrate(db);
|
|
207
248
|
}
|
|
208
249
|
};
|
|
209
250
|
EternityStorage = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EternityStorage.js","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAC3C,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAC3C,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,iBAAiB,EAAmB,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"EternityStorage.js","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { IClassOf } from "../decorators/IClassOf.js";
|
|
1
2
|
import DateTime from "../types/DateTime.js";
|
|
2
3
|
import TimeSpan from "../types/TimeSpan.js";
|
|
3
4
|
import EternityContext from "./EternityContext.js";
|
|
4
5
|
export declare function Activity(target: any, key: any): void;
|
|
5
6
|
export declare function UniqueActivity(target: any, key: any): void;
|
|
6
7
|
export default abstract class Workflow<TIn = any, TOut = any> {
|
|
8
|
+
protected context: EternityContext;
|
|
7
9
|
/**
|
|
8
10
|
* If specified, all workflows in same sequence
|
|
9
11
|
* will executed sequentially in a single worker node
|
|
@@ -15,10 +17,19 @@ export default abstract class Workflow<TIn = any, TOut = any> {
|
|
|
15
17
|
readonly currentTime: DateTime;
|
|
16
18
|
preserveTime: TimeSpan;
|
|
17
19
|
failedPreserveTime: TimeSpan;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
+
constructor({ sequence, input, id, eta, currentTime }: {
|
|
21
|
+
sequence: string;
|
|
22
|
+
input: TIn;
|
|
23
|
+
id: string;
|
|
24
|
+
eta: DateTime;
|
|
25
|
+
currentTime: DateTime;
|
|
26
|
+
}, context: EternityContext);
|
|
20
27
|
abstract run(): Promise<TOut>;
|
|
21
|
-
delay(ts: TimeSpan): Promise<string>;
|
|
22
|
-
waitForExternalEvent(ts: TimeSpan, ...names: string[]): Promise<string>;
|
|
28
|
+
protected delay(ts: TimeSpan): Promise<string>;
|
|
29
|
+
protected waitForExternalEvent(ts: TimeSpan, ...names: string[]): Promise<string>;
|
|
30
|
+
protected runChild<TChildIn, TChildOut>(type: IClassOf<Workflow<TChildIn, TChildOut>>, input: TChildIn): Promise<TChildOut>;
|
|
31
|
+
protected all<T extends readonly unknown[] | []>(values: T): Promise<{
|
|
32
|
+
-readonly [P in keyof T]: Awaited<T[P]>;
|
|
33
|
+
}>;
|
|
23
34
|
}
|
|
24
35
|
//# sourceMappingURL=Workflow.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Workflow.d.ts","sourceRoot":"","sources":["../../src/eternity/Workflow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Workflow.d.ts","sourceRoot":"","sources":["../../src/eternity/Workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAInD,wBAAgB,QAAQ,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,QAEnC;AAED,wBAAgB,cAAc,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,QAEzC;AAGD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE,IAAI,GAAG,GAAG;IAkCpD,SAAS,CAAC,OAAO,EAAE,eAAe;IAhCtC;;;OAGG;IACH,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC,SAAgB,KAAK,EAAE,GAAG,CAAC;IAE3B,SAAgB,EAAE,EAAE,MAAM,CAAC;IAE3B,SAAgB,GAAG,EAAE,QAAQ,CAAC;IAE9B,SAAgB,WAAW,EAAE,QAAQ,CAAC;IAE/B,YAAY,EAAE,QAAQ,CAA2B;IAEjD,kBAAkB,EAAE,QAAQ,CAAwB;gBAGvD,EACI,QAAQ,EACR,KAAK,EACL,EAAE,EACF,GAAG,EACH,WAAW,EACd,EAAE;QACC,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,GAAG,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,EAAE,QAAQ,CAAC;QACd,WAAW,EAAE,QAAQ,CAAA;KACxB,EACS,OAAO,EAAE,eAAe;aAStB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAEpC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ;IAI5B,SAAS,CAAC,oBAAoB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAI,KAAK,EAAE,MAAM,EAAE;cAKhD,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;cAIjH,GAAG,CAAC,CAAC,SAAS,SAAS,OAAO,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC;QAAE,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE,CAAC;CAqB1H"}
|
|
@@ -1,15 +1,5 @@
|
|
|
1
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
-
};
|
|
7
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
-
};
|
|
10
|
-
import Inject from "../di/di.js";
|
|
11
1
|
import TimeSpan from "../types/TimeSpan.js";
|
|
12
|
-
import
|
|
2
|
+
import { ActivitySuspendedError } from "./ActivitySuspendedError.js";
|
|
13
3
|
import { WorkflowRegistry } from "./WorkflowRegistry.js";
|
|
14
4
|
export function Activity(target, key) {
|
|
15
5
|
WorkflowRegistry.register(target.constructor, key);
|
|
@@ -18,6 +8,7 @@ export function UniqueActivity(target, key) {
|
|
|
18
8
|
WorkflowRegistry.register(target.constructor, key, true);
|
|
19
9
|
}
|
|
20
10
|
export default class Workflow {
|
|
11
|
+
context;
|
|
21
12
|
/**
|
|
22
13
|
* If specified, all workflows in same sequence
|
|
23
14
|
* will executed sequentially in a single worker node
|
|
@@ -29,13 +20,13 @@ export default class Workflow {
|
|
|
29
20
|
currentTime;
|
|
30
21
|
preserveTime = TimeSpan.fromMinutes(5);
|
|
31
22
|
failedPreserveTime = TimeSpan.fromDays(1);
|
|
32
|
-
context
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
23
|
+
constructor({ sequence, input, id, eta, currentTime }, context) {
|
|
24
|
+
this.context = context;
|
|
25
|
+
this.input = input;
|
|
26
|
+
this.id = id;
|
|
27
|
+
this.eta = eta;
|
|
28
|
+
this.currentTime = currentTime;
|
|
29
|
+
this.sequence = sequence;
|
|
39
30
|
}
|
|
40
31
|
delay(ts) {
|
|
41
32
|
return Promise.resolve("");
|
|
@@ -44,9 +35,31 @@ export default class Workflow {
|
|
|
44
35
|
// do nothing...
|
|
45
36
|
return Promise.resolve("");
|
|
46
37
|
}
|
|
38
|
+
async runChild(type, input) {
|
|
39
|
+
return this.context.runChild(this, type, input);
|
|
40
|
+
}
|
|
41
|
+
async all(values) {
|
|
42
|
+
let suspended;
|
|
43
|
+
try {
|
|
44
|
+
const r = await Promise.all(values.map(async (x) => {
|
|
45
|
+
try {
|
|
46
|
+
return await x;
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
if (error instanceof ActivitySuspendedError) {
|
|
50
|
+
suspended = error;
|
|
51
|
+
}
|
|
52
|
+
throw error;
|
|
53
|
+
}
|
|
54
|
+
}));
|
|
55
|
+
return r;
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
if (suspended) {
|
|
59
|
+
throw suspended;
|
|
60
|
+
}
|
|
61
|
+
throw error;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
47
64
|
}
|
|
48
|
-
__decorate([
|
|
49
|
-
Inject,
|
|
50
|
-
__metadata("design:type", EternityContext)
|
|
51
|
-
], Workflow.prototype, "context", void 0);
|
|
52
65
|
//# sourceMappingURL=Workflow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Workflow.js","sourceRoot":"","sources":["../../src/eternity/Workflow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Workflow.js","sourceRoot":"","sources":["../../src/eternity/Workflow.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,MAAM,UAAU,QAAQ,CAAC,MAAM,EAAE,GAAG;IAChC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAM,EAAE,GAAG;IACtC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7D,CAAC;AAGD,MAAM,CAAC,OAAO,OAAgB,QAAQ;IAkCpB;IAhCd;;;OAGG;IACa,QAAQ,CAAS;IAEjB,KAAK,CAAM;IAEX,EAAE,CAAS;IAEX,GAAG,CAAW;IAEd,WAAW,CAAW;IAE/B,YAAY,GAAa,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAEjD,kBAAkB,GAAa,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE3D,YACI,EACI,QAAQ,EACR,KAAK,EACL,EAAE,EACF,GAAG,EACH,WAAW,EAOd,EACS,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;QAElC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAIS,KAAK,CAAC,EAAY;QACxB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAES,oBAAoB,CAAC,EAAY,EAAE,GAAI,KAAe;QAC5D,gBAAgB;QAChB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,QAAQ,CAAsB,IAA6C,EAAE,KAAe;QACxG,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,GAAG,CAAoC,MAAS;QAC5D,IAAI,SAAiC,CAAC;QACtC,IAAI;YACA,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC/C,IAAI;oBACA,OAAO,MAAM,CAAC,CAAC;iBAClB;gBAAC,OAAO,KAAK,EAAE;oBACZ,IAAI,KAAK,YAAY,sBAAsB,EAAE;wBACzC,SAAS,GAAG,KAAK,CAAC;qBACrB;oBACD,MAAM,KAAK,CAAC;iBACf;YACL,CAAC,CAAC,CAAC,CAAC;YACJ,OAAO,CAAQ,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,SAAS,EAAE;gBACX,MAAM,SAAS,CAAC;aACnB;YACD,MAAM,KAAK,CAAC;SACf;IACL,CAAC;CACJ"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { IColumn } from "../../decorators/IColumn.js";
|
|
2
2
|
import { IIndex } from "../../decorators/IIndex.js";
|
|
3
|
-
import {
|
|
3
|
+
import { BaseConnection } from "../../drivers/base/BaseDriver.js";
|
|
4
4
|
import EntityType from "../../entity-query/EntityType.js";
|
|
5
5
|
import EntityContext from "../../model/EntityContext.js";
|
|
6
6
|
import PostgresMigrations from "./PostgresMigrations.js";
|
|
7
7
|
export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
8
8
|
migrateTable(context: EntityContext, type: EntityType): Promise<void>;
|
|
9
9
|
createIndexes(context: EntityContext, type: EntityType, fkColumns: IColumn[]): Promise<void>;
|
|
10
|
-
createColumns(driver:
|
|
11
|
-
createTable(driver:
|
|
10
|
+
createColumns(driver: BaseConnection, type: EntityType, nonKeyColumns: IColumn[]): Promise<void>;
|
|
11
|
+
createTable(driver: BaseConnection, type: EntityType, keys: IColumn[]): Promise<void>;
|
|
12
12
|
migrateIndex(context: EntityContext, index: IIndex, type: EntityType): Promise<void>;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=PostgresAutomaticMigrations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PostgresAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAc,MAAM,kCAAkC,CAAC;AAC9E,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAEzD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,kBAAkB;IAEjE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU;IAoBrD,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAc5E,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IAyBhF,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IA8BrE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;CAmB7E"}
|
|
@@ -4,7 +4,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
|
4
4
|
// create table if not exists...
|
|
5
5
|
const nonKeyColumns = type.nonKeys;
|
|
6
6
|
const keys = type.keys;
|
|
7
|
-
const driver = context.
|
|
7
|
+
const driver = context.connection;
|
|
8
8
|
await this.createTable(driver, type, keys);
|
|
9
9
|
await this.createColumns(driver, type, nonKeyColumns);
|
|
10
10
|
await this.createIndexes(context, type, nonKeyColumns.filter((x) => x.fkRelation
|
|
@@ -69,7 +69,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
|
69
69
|
)`);
|
|
70
70
|
}
|
|
71
71
|
async migrateIndex(context, index, type) {
|
|
72
|
-
const driver = context.
|
|
72
|
+
const driver = context.connection;
|
|
73
73
|
const name = type.schema
|
|
74
74
|
? type.schema + "." + type.name
|
|
75
75
|
: type.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AAMA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,kBAAkB;IAEvE,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,IAAgB;QAGvD,gCAAgC;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvB,MAAM,MAAM,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
|