@balena/pinejs 14.59.1 → 15.0.0-build-15-x-9f7b9bfe63741d7ae5f446e013251758d9d6ca26-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +110 -1
- package/CHANGELOG.md +18 -1
- package/VERSION +1 -1
- package/build/browser.ts +0 -1
- package/out/bin/abstract-sql-compiler.js +0 -0
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/odata-compiler.js +0 -0
- package/out/bin/sbvr-compiler.js +0 -0
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/config-loader/config-loader.js +3 -6
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.js +4 -4
- package/out/config-loader/env.js.map +1 -1
- package/out/data-server/sbvr-server.d.ts +1 -13
- package/out/data-server/sbvr-server.js +17 -1
- package/out/data-server/sbvr-server.js.map +1 -1
- package/out/database-layer/db.js +12 -15
- package/out/database-layer/db.js.map +1 -1
- package/out/express-emulator/express.js +4 -4
- package/out/express-emulator/express.js.map +1 -1
- package/out/http-transactions/transactions.d.ts +1 -12
- package/out/http-transactions/transactions.js +18 -0
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.js +12 -16
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/sync.js +6 -12
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +5 -4
- package/out/migrator/utils.js +38 -20
- package/out/migrator/utils.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +18 -3
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.js +1 -1
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/cached-compile.js +1 -1
- package/out/sbvr-api/cached-compile.js.map +1 -1
- package/out/sbvr-api/hooks.js +4 -5
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/odata-response.js +4 -5
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.js +22 -60
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +3 -3
- package/out/sbvr-api/sbvr-utils.js +38 -21
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/uri-parser.js +4 -9
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/package.json +7 -7
- package/src/bin/abstract-sql-compiler.ts +2 -1
- package/src/bin/sbvr-compiler.ts +2 -1
- package/src/config-loader/env.ts +3 -7
- package/src/data-server/sbvr-server.js +17 -1
- package/src/database-layer/db.ts +1 -1
- package/src/express-emulator/express.js +4 -4
- package/src/http-transactions/transactions.js +18 -0
- package/src/migrator/utils.ts +40 -20
- package/src/pinejs-session-store/pinejs-session-store.ts +15 -0
- package/src/sbvr-api/odata-response.ts +1 -2
- package/src/sbvr-api/permissions.ts +17 -59
- package/src/sbvr-api/sbvr-utils.ts +30 -2
- package/src/sbvr-api/uri-parser.ts +4 -2
- package/tsconfig.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/express-emulator/express.js"],"names":[],"mappings":";;AAAA,4BAA4B;AAO5B,MAAM,CAAC,GAAG,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAEzE,CAAC,CAAC,kBAAkB,GAAG,CAAC,cAAc,CAAC,CAAC;AAExC,MAAM,GAAG,GAAG,CAAC;IAEZ,IAAI,KAAK,CAAC;IACV,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACvC,KAAK,GAAG,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC;IAEvC,MAAM,QAAQ,GAAG;QAEhB,GAAG,EAAE,EAAE;QACP,IAAI,EAAE,EAAE;QACR,GAAG,EAAE,EAAE;QACP,MAAM,EAAE,EAAE;QACV,GAAG,EAAE,EAAE;QACP,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;KACX,CAAC;IACF,MAAM,UAAU,GAAG,UACE,WAAW,EACT,KAAK,EACc,GAAG,UAAU;QAGtD,IAAI,SAAS,CAAC;QACd,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,KAAK,EAAE;YACvB,KAAK,GAAG,QAAQ,CAAC;YACjB,SAAS,GAAG,GAAG,CAAC;SAChB;aAAM;YACN,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxC,SAAS,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/express-emulator/express.js"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,3 @@
|
|
|
1
1
|
export function setup(app: import("express").Application, sbvrUtilsInstance: typeof import("../sbvr-api/sbvr-utils"), db: import("../database-layer/db").Database): import("../sbvr-api/common-types").Resolvable<void>;
|
|
2
|
-
export
|
|
3
|
-
const models: {
|
|
4
|
-
apiRoot: string;
|
|
5
|
-
modelText: any;
|
|
6
|
-
customServerCode: {
|
|
7
|
-
setup: typeof setup;
|
|
8
|
-
};
|
|
9
|
-
migrations: {
|
|
10
|
-
'11.0.0-modified-at': string;
|
|
11
|
-
};
|
|
12
|
-
}[];
|
|
13
|
-
}
|
|
2
|
+
export let config: import('../config-loader/config-loader').Config;
|
|
14
3
|
export let addModelHooks: (modelName: string) => void;
|
|
@@ -3,6 +3,7 @@ import { odataNameToSqlName } from '@balena/odata-to-abstract-sql';
|
|
|
3
3
|
// @ts-ignore
|
|
4
4
|
const transactionModel = require('./transaction.sbvr');
|
|
5
5
|
|
|
6
|
+
/** @type {import('../config-loader/config-loader').Config} */
|
|
6
7
|
export let config = {
|
|
7
8
|
models: [
|
|
8
9
|
{
|
|
@@ -24,6 +25,23 @@ ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT N
|
|
|
24
25
|
ALTER TABLE "transaction"
|
|
25
26
|
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;\
|
|
26
27
|
`,
|
|
28
|
+
'15.0.0-data-types': async (tx, sbvrUtils) => {
|
|
29
|
+
switch (sbvrUtils.db.engine) {
|
|
30
|
+
case 'mysql':
|
|
31
|
+
await tx.executeSql(`\
|
|
32
|
+
ALTER TABLE "lock"
|
|
33
|
+
MODIFY "is exclusive" BOOLEAN NOT NULL,
|
|
34
|
+
MODIFY "is under lock" BOOLEAN NOT NULL;`);
|
|
35
|
+
break;
|
|
36
|
+
case 'postgres':
|
|
37
|
+
await tx.executeSql(`\
|
|
38
|
+
ALTER TABLE "lock"
|
|
39
|
+
ALTER COLUMN "is exclusive" SET DATA TYPE BOOLEAN USING b::BOOLEAN,
|
|
40
|
+
ALTER COLUMN "is under lock" SET DATA TYPE BOOLEAN USING b::BOOLEAN;`);
|
|
41
|
+
break;
|
|
42
|
+
// No need to migrate for websql
|
|
43
|
+
}
|
|
44
|
+
},
|
|
27
45
|
},
|
|
28
46
|
},
|
|
29
47
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/http-transactions/transactions.js"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,yEAAmE;AAEnE,MAAM,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/http-transactions/transactions.js"],"names":[],"mappings":"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"}
|
package/out/migrator/async.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a, _b, _c;
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
3
|
exports.run = void 0;
|
|
5
4
|
const _ = require("lodash");
|
|
6
5
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
7
6
|
const utils_1 = require("./utils");
|
|
8
7
|
const env_1 = require("../config-loader/env");
|
|
9
|
-
(
|
|
8
|
+
(sbvrUtils.api?.migrations?.logger.info ?? console.info)(`Async migration execution is ${(0, env_1.booleanToEnabledString)(utils_1.migratorEnv.asyncMigrationIsEnabled)}`);
|
|
10
9
|
const run = async (tx, model) => {
|
|
11
10
|
const { migrations } = model;
|
|
12
11
|
if (migrations == null || _.isEmpty(migrations)) {
|
|
@@ -20,13 +19,12 @@ const run = async (tx, model) => {
|
|
|
20
19
|
};
|
|
21
20
|
exports.run = run;
|
|
22
21
|
const $run = async (setupTx, model, migrations) => {
|
|
23
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
24
22
|
const modelName = model.apiRoot;
|
|
25
23
|
const asyncMigrationSetup = [];
|
|
26
24
|
const modelIsNew = await sbvrUtils.isModelNew(setupTx, modelName);
|
|
27
25
|
const executedMigrations = await (0, utils_1.getExecutedMigrations)(setupTx, modelName);
|
|
28
26
|
if (modelIsNew) {
|
|
29
|
-
(
|
|
27
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)('First time model has executed, skipping async migrations');
|
|
30
28
|
return await (0, utils_1.setExecutedMigrations)(setupTx, modelName, [
|
|
31
29
|
...executedMigrations,
|
|
32
30
|
...Object.keys(migrations),
|
|
@@ -56,11 +54,11 @@ const $run = async (setupTx, model, migrations) => {
|
|
|
56
54
|
}, sbvrUtils)).rowsAffected;
|
|
57
55
|
}
|
|
58
56
|
else if (migration.asyncSql && typeof migration.asyncSql === 'string') {
|
|
59
|
-
const asyncMigrationSqlStatement =
|
|
57
|
+
const asyncMigrationSqlStatement = migration.asyncSql?.replace('%%ASYNC_BATCH_SIZE%%', `${batchSize}`);
|
|
60
58
|
asyncRunnerMigratorFn = async (tx) => (await tx.executeSql(asyncMigrationSqlStatement)).rowsAffected;
|
|
61
59
|
}
|
|
62
60
|
else {
|
|
63
|
-
(
|
|
61
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`Invalid migration object: ${JSON.stringify(migration, null, 2)}`);
|
|
64
62
|
continue;
|
|
65
63
|
}
|
|
66
64
|
initMigrationState = {
|
|
@@ -72,7 +70,7 @@ const $run = async (setupTx, model, migrations) => {
|
|
|
72
70
|
asyncRunnerMigratorFn = async (tx) => (await tx.executeSql(migration)).rowsAffected;
|
|
73
71
|
}
|
|
74
72
|
else {
|
|
75
|
-
(
|
|
73
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`Invalid async migration object: ${JSON.stringify(migration, null, 2)}`);
|
|
76
74
|
continue;
|
|
77
75
|
}
|
|
78
76
|
await (0, utils_1.initMigrationStatus)(setupTx, initMigrationState);
|
|
@@ -85,17 +83,15 @@ const $run = async (setupTx, model, migrations) => {
|
|
|
85
83
|
setupTx.on('end', () => {
|
|
86
84
|
for (const { key, initMigrationState, asyncRunnerMigratorFn, } of asyncMigrationSetup) {
|
|
87
85
|
const asyncRunner = async () => {
|
|
88
|
-
var _a, _b;
|
|
89
86
|
if (!utils_1.migratorEnv.asyncMigrationIsEnabled) {
|
|
90
87
|
setTimeout(asyncRunner, initMigrationState.backoffDelayMS);
|
|
91
88
|
return;
|
|
92
89
|
}
|
|
93
90
|
try {
|
|
94
91
|
const $migrationState = await sbvrUtils.db.transaction(async (tx) => await (0, utils_1.lockMigrations)({ tx, modelName, blocking: false }, async () => {
|
|
95
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
96
92
|
const migrationState = await (0, utils_1.readMigrationStatus)(tx, key);
|
|
97
93
|
if (!migrationState) {
|
|
98
|
-
(
|
|
94
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`stopping async migration due to missing migration status: ${key}`);
|
|
99
95
|
return false;
|
|
100
96
|
}
|
|
101
97
|
if (migrationState.last_run_time) {
|
|
@@ -109,13 +105,12 @@ const $run = async (setupTx, model, migrations) => {
|
|
|
109
105
|
}
|
|
110
106
|
try {
|
|
111
107
|
const migratedRows = await sbvrUtils.db.transaction(async (migrationTx) => {
|
|
112
|
-
|
|
113
|
-
return ((_a = (await (asyncRunnerMigratorFn === null || asyncRunnerMigratorFn === void 0 ? void 0 : asyncRunnerMigratorFn(migrationTx)))) !== null && _a !== void 0 ? _a : 0);
|
|
108
|
+
return ((await asyncRunnerMigratorFn?.(migrationTx)) ?? 0);
|
|
114
109
|
});
|
|
115
110
|
migrationState.migrated_row_count += migratedRows;
|
|
116
111
|
if (migratedRows === 0) {
|
|
117
112
|
migrationState.is_backing_off = true;
|
|
118
|
-
|
|
113
|
+
migrationState.converged_time ??= new Date();
|
|
119
114
|
}
|
|
120
115
|
else {
|
|
121
116
|
migrationState.is_backing_off = false;
|
|
@@ -127,12 +122,13 @@ const $run = async (setupTx, model, migrations) => {
|
|
|
127
122
|
if (migrationState.error_count %
|
|
128
123
|
initMigrationState.errorThreshold ===
|
|
129
124
|
0) {
|
|
130
|
-
(
|
|
125
|
+
(sbvrUtils.api.migrations?.logger.error ??
|
|
126
|
+
console.error)(`${key}: ${err.name} ${err.message}`);
|
|
131
127
|
migrationState.is_backing_off = true;
|
|
132
128
|
}
|
|
133
129
|
}
|
|
134
130
|
else {
|
|
135
|
-
(
|
|
131
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`async migration error unknown: ${key}: ${err}`);
|
|
136
132
|
}
|
|
137
133
|
}
|
|
138
134
|
finally {
|
|
@@ -153,7 +149,7 @@ const $run = async (setupTx, model, migrations) => {
|
|
|
153
149
|
}
|
|
154
150
|
}
|
|
155
151
|
catch (err) {
|
|
156
|
-
(
|
|
152
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`error running async migration: ${key}: ${err}`);
|
|
157
153
|
setTimeout(asyncRunner, initMigrationState.backoffDelayMS);
|
|
158
154
|
}
|
|
159
155
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../src/migrator/async.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../src/migrator/async.ts"],"names":[],"mappings":";;;AAGA,4BAA4B;AAC5B,oDAAoD;AASpD,mCAeiB;AACjB,8CAA8D;AAG9D,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CACvD,gCAAgC,IAAA,4BAAsB,EACrD,mBAAW,CAAC,uBAAuB,CACnC,EAAE,CACH,CAAC;AAEK,MAAM,GAAG,GAAG,KAAK,EAAE,EAAM,EAAE,KAAmB,EAAiB,EAAE;IACvE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC7B,IAAI,UAAU,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAChD,OAAO;KACP;IACD,MAAM,eAAe,GACpB,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC;IACxC,IAAI,eAAe,IAAI,IAAI,EAAE;QAC5B,OAAO;KACP;IAED,MAAM,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;AACxC,CAAC,CAAC;AAZW,QAAA,GAAG,OAYd;AAEF,MAAM,IAAI,GAAG,KAAK,EACjB,OAAW,EACX,KAAmB,EACnB,UAAmC,EACnB,EAAE;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC;IAEhC,MAAM,mBAAmB,GAIpB,EAAE,CAAC;IAGR,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAClE,MAAM,kBAAkB,GAAG,MAAM,IAAA,6BAAqB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE3E,IAAI,UAAU,EAAE;QACf,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CACtD,0DAA0D,CAC1D,CAAC;QAEF,OAAO,MAAM,IAAA,6BAAqB,EAAC,OAAO,EAAE,SAAS,EAAE;YACtD,GAAG,kBAAkB;YACrB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SAC1B,CAAC,CAAC;KACH;IAyCD,MAAM,iBAAiB,GAAqB,IAAA,sCAA8B,EACzE,UAAU,EACV,kBAAkB,CAClB,CAAC;IAMF,KAAK,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,iBAAiB,EAAE;QACjD,IAAI,qBAAkD,CAAC;QACvD,IAAI,kBAAkB,GAA2B;YAChD,aAAa,EAAE,GAAG;YAClB,UAAU,EAAE,IAAI,IAAI,EAAE;YACtB,aAAa,EAAE,IAAI,IAAI,EAAE;YACzB,SAAS,EAAE,CAAC;YACZ,kBAAkB,EAAE,CAAC;YACrB,WAAW,EAAE,CAAC;YACd,cAAc,EAAE,mBAAW,CAAC,mCAAmC;YAC/D,OAAO,EAAE,mBAAW,CAAC,4BAA4B;YACjD,cAAc,EAAE,mBAAW,CAAC,mCAAmC;YAC/D,cAAc,EAAE,SAAS;YACzB,cAAc,EAAE,KAAK;SACrB,CAAC;QAEF,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YAClC,MAAM,SAAS,GACd,SAAS,CAAC,cAAc,IAAI,mBAAW,CAAC,8BAA8B,CAAC;YACxE,IAAI,SAAS,CAAC,OAAO,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,UAAU,EAAE;gBACjE,qBAAqB,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE,CACxC,CACC,MAAO,SAAS,CAAC,OAA4B,CAC5C,EAAE,EACF;oBACC,SAAS;iBACT,EACD,SAAS,CACT,CACD,CAAC,YAAY,CAAC;aAChB;iBAAM,IAAI,SAAS,CAAC,QAAQ,IAAI,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACxE,MAAM,0BAA0B,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAC7D,sBAAsB,EACtB,GAAG,SAAS,EAAE,CACd,CAAC;gBACF,qBAAqB,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE,CACxC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,CAAC,YAAY,CAAC;aAChE;iBAAM;gBAEN,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CACxD,6BAA6B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACjE,CAAC;gBACF,SAAS;aACT;YAED,kBAAkB,GAAG;gBACpB,GAAG,kBAAkB;gBACrB,GAAG,CAAC,CAAC,MAAM,CACV,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAClE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CACxB;aACD,CAAC;SACF;aAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACzC,qBAAqB,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE,CACxC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;SAC/C;aAAM;YACN,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CACxD,mCAAmC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACvE,CAAC;YACF,SAAS;SACT;QACD,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAEvD,mBAAmB,CAAC,IAAI,CAAC;YACxB,GAAG;YACH,kBAAkB;YAClB,qBAAqB;SACrB,CAAC,CAAC;KACH;IAKD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QACtB,KAAK,MAAM,EACV,GAAG,EACH,kBAAkB,EAClB,qBAAqB,GACrB,IAAI,mBAAmB,EAAE;YACzB,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;gBAE9B,IAAI,CAAC,mBAAW,CAAC,uBAAuB,EAAE;oBACzC,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;oBAC3D,OAAO;iBACP;gBACD,IAAI;oBACH,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,WAAW,CACrD,KAAK,EAAE,EAAE,EAAE,EAAE,CACZ,MAAM,IAAA,sBAAc,EACnB,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAClC,KAAK,IAAI,EAAE;wBACV,MAAM,cAAc,GAAG,MAAM,IAAA,2BAAmB,EAAC,EAAE,EAAE,GAAG,CAAC,CAAC;wBAE1D,IAAI,CAAC,cAAc,EAAE;4BAGpB,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CACtD,6DAA6D,GAAG,EAAE,CAClE,CAAC;4BACF,OAAO,KAAK,CAAC;yBACb;wBAID,IAAI,cAAc,CAAC,aAAa,EAAE;4BACjC,MAAM,oBAAoB,GACzB,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;4BACrD,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc;gCAC5C,CAAC,CAAC,kBAAkB,CAAC,cAAc;gCACnC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC;4BAC9B,IAAI,oBAAoB,GAAG,OAAO,EAAE;gCAEnC,OAAO;6BACP;yBACD;wBACD,IAAI;4BAGH,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,WAAW,CAClD,KAAK,EAAE,WAAW,EAAE,EAAE;gCACrB,OAAO,CACN,CAAC,MAAM,qBAAqB,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CACjD,CAAC;4BACH,CAAC,CACD,CAAC;4BACF,cAAc,CAAC,kBAAkB,IAAI,YAAY,CAAC;4BAClD,IAAI,YAAY,KAAK,CAAC,EAAE;gCAEvB,cAAc,CAAC,cAAc,GAAG,IAAI,CAAC;gCAErC,cAAc,CAAC,cAAc,KAAK,IAAI,IAAI,EAAE,CAAC;6BAC7C;iCAAM;gCAGN,cAAc,CAAC,cAAc,GAAG,KAAK,CAAC;6BACtC;yBACD;wBAAC,OAAO,GAAY,EAAE;4BACtB,cAAc,CAAC,WAAW,EAAE,CAAC;4BAC7B,IAAI,GAAG,YAAY,KAAK,EAAE;gCACzB,IACC,cAAc,CAAC,WAAW;oCACzB,kBAAkB,CAAC,cAAc;oCAClC,CAAC,EACA;oCACD,CACC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK;wCACtC,OAAO,CAAC,KAAK,CACb,CAAC,GAAG,GAAG,KAAK,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oCACxC,cAAc,CAAC,cAAc,GAAG,IAAI,CAAC;iCACrC;6BACD;iCAAM;gCACN,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CACxD,kCAAkC,GAAG,KAAK,GAAG,EAAE,CAC/C,CAAC;6BACF;yBACD;gCAAS;4BAGT,cAAc,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC;4BAC1C,cAAc,CAAC,SAAS,IAAI,CAAC,CAAC;4BAC9B,MAAM,IAAA,6BAAqB,EAAC,EAAE,EAAE,cAAc,CAAC,CAAC;yBAChD;wBACD,OAAO,cAAc,CAAC;oBACvB,CAAC,CACD,CACF,CAAC;oBACF,IAAI,eAAe,KAAK,KAAK,EAAE;wBAE9B,OAAO;qBACP;oBACD,IAAI,eAAe,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE;wBAC9D,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;qBAC3D;yBAAM;wBACN,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;qBACpD;iBACD;gBAAC,OAAO,GAAG,EAAE;oBACb,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CACxD,kCAAkC,GAAG,KAAK,GAAG,EAAE,CAC/C,CAAC;oBACF,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;iBAC3D;YACF,CAAC,CAAC;YAEF,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;SACpD;IACF,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
package/out/migrator/sync.js
CHANGED
|
@@ -5,7 +5,6 @@ const utils_1 = require("./utils");
|
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
7
7
|
const postRun = async (tx, model) => {
|
|
8
|
-
var _a, _b;
|
|
9
8
|
const { initSql } = model;
|
|
10
9
|
if (initSql == null) {
|
|
11
10
|
return;
|
|
@@ -13,14 +12,13 @@ const postRun = async (tx, model) => {
|
|
|
13
12
|
const modelName = model.apiRoot;
|
|
14
13
|
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
|
15
14
|
if (modelIsNew) {
|
|
16
|
-
(
|
|
15
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`First time executing '${modelName}', running init script`);
|
|
17
16
|
await (0, utils_1.lockMigrations)({ tx, modelName, blocking: true }, async () => {
|
|
18
|
-
var _a, _b;
|
|
19
17
|
try {
|
|
20
18
|
await tx.executeSql(initSql);
|
|
21
19
|
}
|
|
22
20
|
catch (err) {
|
|
23
|
-
(
|
|
21
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`initSql execution error ${err} `);
|
|
24
22
|
throw new utils_1.MigrationError(err);
|
|
25
23
|
}
|
|
26
24
|
});
|
|
@@ -37,15 +35,13 @@ const run = async (tx, model) => {
|
|
|
37
35
|
};
|
|
38
36
|
exports.run = run;
|
|
39
37
|
const $run = async (tx, model, migrations) => {
|
|
40
|
-
var _a, _b;
|
|
41
38
|
const modelName = model.apiRoot;
|
|
42
39
|
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
|
43
40
|
if (modelIsNew) {
|
|
44
|
-
(
|
|
41
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`First time model '${modelName}' has executed, skipping migrations`);
|
|
45
42
|
return await (0, utils_1.setExecutedMigrations)(tx, modelName, Object.keys(migrations));
|
|
46
43
|
}
|
|
47
44
|
await (0, utils_1.lockMigrations)({ tx, modelName, blocking: true }, async () => {
|
|
48
|
-
var _a, _b;
|
|
49
45
|
try {
|
|
50
46
|
const executedMigrations = await (0, utils_1.getExecutedMigrations)(tx, modelName);
|
|
51
47
|
const pendingMigrations = (0, utils_1.filterAndSortPendingMigrations)(migrations, executedMigrations);
|
|
@@ -59,27 +55,25 @@ const $run = async (tx, model, migrations) => {
|
|
|
59
55
|
]);
|
|
60
56
|
}
|
|
61
57
|
catch (err) {
|
|
62
|
-
(
|
|
58
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`Failed to executed synchronous migrations from api root model ${err}`);
|
|
63
59
|
throw new utils_1.MigrationError(err);
|
|
64
60
|
}
|
|
65
61
|
});
|
|
66
62
|
};
|
|
67
63
|
const executeMigrations = async (tx, migrations = []) => {
|
|
68
|
-
var _a, _b;
|
|
69
64
|
try {
|
|
70
65
|
for (const migration of migrations) {
|
|
71
66
|
await executeMigration(tx, migration);
|
|
72
67
|
}
|
|
73
68
|
}
|
|
74
69
|
catch (err) {
|
|
75
|
-
(
|
|
70
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)('Error while executing migrations, rolled back');
|
|
76
71
|
throw new utils_1.MigrationError(err);
|
|
77
72
|
}
|
|
78
73
|
return migrations.map(([migrationKey]) => migrationKey);
|
|
79
74
|
};
|
|
80
75
|
const executeMigration = async (tx, [key, migration]) => {
|
|
81
|
-
|
|
82
|
-
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)(`Running migration ${JSON.stringify(key)}`);
|
|
76
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`Running migration ${JSON.stringify(key)}`);
|
|
83
77
|
if (typeof migration === 'function') {
|
|
84
78
|
await migration(tx, sbvrUtils);
|
|
85
79
|
}
|
package/out/migrator/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":";;;AAAA,mCAUiB;AAIjB,4BAA4B;AAC5B,oDAAoD;AAI7C,MAAM,OAAO,GAAG,KAAK,EAAE,EAAM,EAAE,KAAmB,EAAiB,EAAE
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":"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"}
|
package/out/migrator/utils.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { Resolvable } from '../sbvr-api/common-types';
|
|
|
3
3
|
import { TypedError } from 'typed-error';
|
|
4
4
|
export { migrator as migratorEnv } from '../config-loader/env';
|
|
5
5
|
export declare const modelText: any;
|
|
6
|
+
export declare const migrations: Migrations;
|
|
6
7
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
7
8
|
export declare enum MigrationCategories {
|
|
8
9
|
'sync' = "sync",
|
|
@@ -47,7 +48,7 @@ export type BaseAsyncMigration = {
|
|
|
47
48
|
export type AsyncMigration = AddFn<BaseAsyncMigration, 'async' | 'sync'> | AddSql<BaseAsyncMigration, 'async' | 'sync'> | AddFn<AddSql<BaseAsyncMigration, 'async'>, 'sync'> | AddFn<AddSql<BaseAsyncMigration, 'sync'>, 'async'>;
|
|
48
49
|
export declare function isAsyncMigration(migration: AsyncMigration | RunnableMigrations): migration is AsyncMigration;
|
|
49
50
|
export declare function isSyncMigration(migration: string | MigrationFn | RunnableMigrations): migration is MigrationFn;
|
|
50
|
-
export declare function areCategorizedMigrations(migrations: Migrations): migrations is CategorizedMigrations;
|
|
51
|
+
export declare function areCategorizedMigrations($migrations: Migrations): $migrations is CategorizedMigrations;
|
|
51
52
|
export type Migration = string | MigrationFn | AsyncMigration;
|
|
52
53
|
export declare class MigrationError extends TypedError {
|
|
53
54
|
}
|
|
@@ -61,9 +62,9 @@ export type MigrationStatus = {
|
|
|
61
62
|
converged_time: Date | undefined;
|
|
62
63
|
is_backing_off: boolean;
|
|
63
64
|
};
|
|
64
|
-
export declare const getRunnableAsyncMigrations: (migrations: Migrations) => RunnableAsyncMigrations | undefined;
|
|
65
|
-
export declare const getRunnableSyncMigrations: (migrations: Migrations) => RunnableMigrations;
|
|
66
|
-
export declare const filterAndSortPendingMigrations: (migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>, executedMigrations: string[]) => MigrationTuple[];
|
|
65
|
+
export declare const getRunnableAsyncMigrations: ($migrations: Migrations) => RunnableAsyncMigrations | undefined;
|
|
66
|
+
export declare const getRunnableSyncMigrations: ($migrations: Migrations) => RunnableMigrations;
|
|
67
|
+
export declare const filterAndSortPendingMigrations: ($migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>, executedMigrations: string[]) => MigrationTuple[];
|
|
67
68
|
export declare const binds: (strings: TemplateStringsArray, ...bindNums: number[]) => string;
|
|
68
69
|
export declare const lockMigrations: <T>(options: {
|
|
69
70
|
tx: Tx;
|
package/out/migrator/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readMigrationStatus = exports.updateMigrationStatus = exports.initMigrationStatus = exports.migrationTablesExist = exports.getExecutedMigrations = exports.setExecutedMigrations = exports.lockMigrations = exports.binds = exports.filterAndSortPendingMigrations = exports.getRunnableSyncMigrations = exports.getRunnableAsyncMigrations = exports.MigrationError = exports.areCategorizedMigrations = exports.isSyncMigration = exports.isAsyncMigration = exports.defaultMigrationCategory = exports.MigrationCategories = exports.modelText = exports.migratorEnv = void 0;
|
|
3
|
+
exports.readMigrationStatus = exports.updateMigrationStatus = exports.initMigrationStatus = exports.migrationTablesExist = exports.getExecutedMigrations = exports.setExecutedMigrations = exports.lockMigrations = exports.binds = exports.filterAndSortPendingMigrations = exports.getRunnableSyncMigrations = exports.getRunnableAsyncMigrations = exports.MigrationError = exports.areCategorizedMigrations = exports.isSyncMigration = exports.isAsyncMigration = exports.defaultMigrationCategory = exports.MigrationCategories = exports.migrations = exports.modelText = exports.migratorEnv = void 0;
|
|
4
4
|
const crypto_1 = require("crypto");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const typed_error_1 = require("typed-error");
|
|
@@ -10,6 +10,22 @@ Object.defineProperty(exports, "migratorEnv", { enumerable: true, get: function
|
|
|
10
10
|
const env_3 = require("../config-loader/env");
|
|
11
11
|
const control_flow_1 = require("../sbvr-api/control-flow");
|
|
12
12
|
exports.modelText = require('./migrations.sbvr');
|
|
13
|
+
exports.migrations = {
|
|
14
|
+
'15.0.0-data-types': async (tx, { db }) => {
|
|
15
|
+
switch (db.engine) {
|
|
16
|
+
case 'mysql':
|
|
17
|
+
await tx.executeSql(`\
|
|
18
|
+
ALTER TABLE "migration"
|
|
19
|
+
MODIFY "executed migrations" JSON NOT NULL;`);
|
|
20
|
+
break;
|
|
21
|
+
case 'postgres':
|
|
22
|
+
await tx.executeSql(`\
|
|
23
|
+
ALTER TABLE "migration"
|
|
24
|
+
ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING b::JSONB;`);
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
},
|
|
28
|
+
};
|
|
13
29
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
14
30
|
var MigrationCategories;
|
|
15
31
|
(function (MigrationCategories) {
|
|
@@ -25,10 +41,10 @@ function isSyncMigration(migration) {
|
|
|
25
41
|
return typeof migration === 'function' || typeof migration === 'string';
|
|
26
42
|
}
|
|
27
43
|
exports.isSyncMigration = isSyncMigration;
|
|
28
|
-
function areCategorizedMigrations(migrations) {
|
|
29
|
-
const containsCategories = Object.keys(MigrationCategories).some((key) => key in migrations);
|
|
44
|
+
function areCategorizedMigrations($migrations) {
|
|
45
|
+
const containsCategories = Object.keys(MigrationCategories).some((key) => key in $migrations);
|
|
30
46
|
if (containsCategories &&
|
|
31
|
-
Object.keys(migrations).some((key) => !(key in MigrationCategories))) {
|
|
47
|
+
Object.keys($migrations).some((key) => !(key in MigrationCategories))) {
|
|
32
48
|
throw new Error('Mixing categorized and uncategorized migrations is not supported');
|
|
33
49
|
}
|
|
34
50
|
return containsCategories;
|
|
@@ -37,26 +53,25 @@ exports.areCategorizedMigrations = areCategorizedMigrations;
|
|
|
37
53
|
class MigrationError extends typed_error_1.TypedError {
|
|
38
54
|
}
|
|
39
55
|
exports.MigrationError = MigrationError;
|
|
40
|
-
const getRunnableAsyncMigrations = (migrations) => {
|
|
41
|
-
if (migrations[MigrationCategories.async]) {
|
|
42
|
-
if (Object.values(migrations[MigrationCategories.async]).some((migration) => !isAsyncMigration(migration)) ||
|
|
43
|
-
typeof migrations[MigrationCategories.async] !== 'object') {
|
|
56
|
+
const getRunnableAsyncMigrations = ($migrations) => {
|
|
57
|
+
if ($migrations[MigrationCategories.async]) {
|
|
58
|
+
if (Object.values($migrations[MigrationCategories.async]).some((migration) => !isAsyncMigration(migration)) ||
|
|
59
|
+
typeof $migrations[MigrationCategories.async] !== 'object') {
|
|
44
60
|
throw new Error(`All loaded async migrations need to be of type: ${MigrationCategories.async}`);
|
|
45
61
|
}
|
|
46
|
-
return migrations[MigrationCategories.async];
|
|
62
|
+
return $migrations[MigrationCategories.async];
|
|
47
63
|
}
|
|
48
64
|
};
|
|
49
65
|
exports.getRunnableAsyncMigrations = getRunnableAsyncMigrations;
|
|
50
|
-
const getRunnableSyncMigrations = (migrations) => {
|
|
51
|
-
|
|
52
|
-
if (areCategorizedMigrations(migrations)) {
|
|
66
|
+
const getRunnableSyncMigrations = ($migrations) => {
|
|
67
|
+
if (areCategorizedMigrations($migrations)) {
|
|
53
68
|
const runnableMigrations = {};
|
|
54
|
-
for (const [category, categoryMigrations] of Object.entries(migrations)) {
|
|
69
|
+
for (const [category, categoryMigrations] of Object.entries($migrations)) {
|
|
55
70
|
if (category in MigrationCategories) {
|
|
56
71
|
for (const [key, migration] of Object.entries(categoryMigrations)) {
|
|
57
72
|
if (isAsyncMigration(migration)) {
|
|
58
73
|
if (migration.finalize) {
|
|
59
|
-
runnableMigrations[key] =
|
|
74
|
+
runnableMigrations[key] = migration.syncFn ?? migration.syncSql;
|
|
60
75
|
}
|
|
61
76
|
}
|
|
62
77
|
else if (isSyncMigration(migration)) {
|
|
@@ -67,10 +82,10 @@ const getRunnableSyncMigrations = (migrations) => {
|
|
|
67
82
|
}
|
|
68
83
|
return runnableMigrations;
|
|
69
84
|
}
|
|
70
|
-
return migrations;
|
|
85
|
+
return $migrations;
|
|
71
86
|
};
|
|
72
87
|
exports.getRunnableSyncMigrations = getRunnableSyncMigrations;
|
|
73
|
-
const filterAndSortPendingMigrations = (migrations, executedMigrations) => _(migrations).omit(executedMigrations)
|
|
88
|
+
const filterAndSortPendingMigrations = ($migrations, executedMigrations) => _($migrations).omit(executedMigrations)
|
|
74
89
|
.toPairs()
|
|
75
90
|
.sortBy(([migrationKey]) => migrationKey)
|
|
76
91
|
.value();
|
|
@@ -171,7 +186,10 @@ WHERE "migration"."model name" = ${1}`, [modelName]);
|
|
|
171
186
|
if (data == null) {
|
|
172
187
|
return [];
|
|
173
188
|
}
|
|
174
|
-
|
|
189
|
+
if (typeof data.executed_migrations === 'string') {
|
|
190
|
+
return JSON.parse(data.executed_migrations);
|
|
191
|
+
}
|
|
192
|
+
return data.executed_migrations;
|
|
175
193
|
};
|
|
176
194
|
exports.getExecutedMigrations = getExecutedMigrations;
|
|
177
195
|
const migrationTablesExist = async (tx) => {
|
|
@@ -190,7 +208,7 @@ WHERE NOT EXISTS (SELECT 1 FROM "migration status" WHERE "migration key" = ${5})
|
|
|
190
208
|
`, [
|
|
191
209
|
migrationStatus['migration_key'],
|
|
192
210
|
migrationStatus['start_time'],
|
|
193
|
-
migrationStatus['is_backing_off']
|
|
211
|
+
migrationStatus['is_backing_off'],
|
|
194
212
|
migrationStatus['run_count'],
|
|
195
213
|
migrationStatus['migration_key'],
|
|
196
214
|
]);
|
|
@@ -217,7 +235,7 @@ WHERE "migration status"."migration key" = ${7};`, [
|
|
|
217
235
|
migrationStatus['migrated_row_count'],
|
|
218
236
|
migrationStatus['error_count'],
|
|
219
237
|
migrationStatus['converged_time'],
|
|
220
|
-
migrationStatus['is_backing_off']
|
|
238
|
+
migrationStatus['is_backing_off'],
|
|
221
239
|
migrationStatus['migration_key'],
|
|
222
240
|
]);
|
|
223
241
|
}
|
|
@@ -245,7 +263,7 @@ LIMIT 1;`, [migrationKey]);
|
|
|
245
263
|
migrated_row_count: data['migrated row count'],
|
|
246
264
|
error_count: data['error count'],
|
|
247
265
|
converged_time: data['converged time'],
|
|
248
|
-
is_backing_off: data['is backing off'] === 1,
|
|
266
|
+
is_backing_off: data['is backing off'] === true || data['is backing off'] === 1,
|
|
249
267
|
};
|
|
250
268
|
}
|
|
251
269
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":";;;AAGA,mCAAoC;AAEpC,4BAA4B;AAC5B,6CAAyC;AACzC,8CAA+D;AAC/D,4CAA+D;AAAtD,kGAAA,QAAQ,OAAe;AAChC,8CAA4D;AAC5D,2DAAiD;AAGpC,QAAA,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports.PinejsSessionStore = exports.Store = void 0;
|
|
4
5
|
const express_session_1 = require("express-session");
|
|
@@ -37,7 +38,7 @@ const asCallback = async (callback, promise) => {
|
|
|
37
38
|
err = $err;
|
|
38
39
|
}
|
|
39
40
|
try {
|
|
40
|
-
callback
|
|
41
|
+
callback?.(err, result);
|
|
41
42
|
}
|
|
42
43
|
catch {
|
|
43
44
|
}
|
|
@@ -64,11 +65,10 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
|
64
65
|
}));
|
|
65
66
|
});
|
|
66
67
|
this.set = ((sid, data, callback) => {
|
|
67
|
-
var _a, _b;
|
|
68
68
|
const body = {
|
|
69
69
|
session_id: sid,
|
|
70
70
|
data,
|
|
71
|
-
expiry_time:
|
|
71
|
+
expiry_time: data?.cookie?.expires ?? null,
|
|
72
72
|
};
|
|
73
73
|
asCallback(callback, sbvr_utils_1.api.session.put({
|
|
74
74
|
resource: 'session',
|
|
@@ -133,6 +133,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
exports.PinejsSessionStore = PinejsSessionStore;
|
|
136
|
+
_a = PinejsSessionStore;
|
|
136
137
|
PinejsSessionStore.config = {
|
|
137
138
|
models: [
|
|
138
139
|
{
|
|
@@ -148,6 +149,20 @@ PinejsSessionStore.config = {
|
|
|
148
149
|
ALTER TABLE "session"
|
|
149
150
|
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
|
150
151
|
`,
|
|
152
|
+
'15.0.0-data-types': async (tx, sbvrUtils) => {
|
|
153
|
+
switch (sbvrUtils.db.engine) {
|
|
154
|
+
case 'mysql':
|
|
155
|
+
await tx.executeSql(`\
|
|
156
|
+
ALTER TABLE "session"
|
|
157
|
+
MODIFY "data" JSON NOT NULL;`);
|
|
158
|
+
break;
|
|
159
|
+
case 'postgres':
|
|
160
|
+
await tx.executeSql(`\
|
|
161
|
+
ALTER TABLE "session"
|
|
162
|
+
ALTER COLUMN "data" SET DATA TYPE JSONB USING b::JSONB;`);
|
|
163
|
+
break;
|
|
164
|
+
}
|
|
165
|
+
},
|
|
151
166
|
},
|
|
152
167
|
},
|
|
153
168
|
],
|