@rsdk/db.typeorm 4.0.0-next.1 → 4.0.0-next.3
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/CHANGELOG.md +11 -0
- package/dist/internal/test/util.js +4 -2
- package/dist/internal/test/util.js.map +1 -1
- package/dist/modules/migration-checker.module.js +4 -4
- package/dist/modules/migration-checker.module.js.map +1 -1
- package/dist/providers/typeorm-logger.adapter.js +9 -2
- package/dist/providers/typeorm-logger.adapter.js.map +1 -1
- package/dist/providers/typeorm.config.js +2 -1
- package/dist/providers/typeorm.config.js.map +1 -1
- package/dist/providers/typeorm.healthcheck.js +8 -4
- package/dist/providers/typeorm.healthcheck.js.map +1 -1
- package/package.json +12 -10
- package/src/providers/typeorm-logger.adapter.ts +6 -1
- package/src/providers/typeorm.healthcheck.ts +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.0.0-next.3](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.2...v4.0.0-next.3) (2023-11-12)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* all yarn peers dependency issues ([e0db9ef](https://github.com/R-Vision/rsdk/commit/e0db9ef1ab8a4df4e1f8ff6f6a9e3728f497549b))
|
|
11
|
+
* one HEALTH_CHECK_QUERY + log it with trace level ([c6765da](https://github.com/R-Vision/rsdk/commit/c6765daedfec2e74230cc99234609dc57e2f39c3))
|
|
12
|
+
|
|
13
|
+
## [4.0.0-next.2](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.1...v4.0.0-next.2) (2023-11-10)
|
|
14
|
+
|
|
15
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
16
|
+
|
|
6
17
|
## [4.0.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.0...v4.0.0-next.1) (2023-11-10)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
@@ -20,10 +20,11 @@ exports.cat = {
|
|
|
20
20
|
id: 1,
|
|
21
21
|
name: 'Pushistik',
|
|
22
22
|
};
|
|
23
|
-
let Cat =
|
|
23
|
+
let Cat = class Cat {
|
|
24
24
|
id;
|
|
25
25
|
name;
|
|
26
26
|
};
|
|
27
|
+
exports.Cat = Cat;
|
|
27
28
|
__decorate([
|
|
28
29
|
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
29
30
|
__metadata("design:type", Number)
|
|
@@ -35,11 +36,12 @@ __decorate([
|
|
|
35
36
|
exports.Cat = Cat = __decorate([
|
|
36
37
|
(0, typeorm_1.Entity)()
|
|
37
38
|
], Cat);
|
|
38
|
-
let Account =
|
|
39
|
+
let Account = class Account {
|
|
39
40
|
id;
|
|
40
41
|
balance;
|
|
41
42
|
balanceLastUpdateAt;
|
|
42
43
|
};
|
|
44
|
+
exports.Account = Account;
|
|
43
45
|
__decorate([
|
|
44
46
|
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
45
47
|
__metadata("design:type", Number)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/internal/test/util.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAEjE,gDAA6C;AAEhC,QAAA,SAAS,GAAG;IACvB,EAAE,EAAE,CAAC;IACL,IAAI,EAAE,QAAQ;CACf,CAAC;AACW,QAAA,GAAG,GAAG;IACjB,EAAE,EAAE,CAAC;IACL,IAAI,EAAE,WAAW;CAClB,CAAC;AAGK,IAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/internal/test/util.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAEjE,gDAA6C;AAEhC,QAAA,SAAS,GAAG;IACvB,EAAE,EAAE,CAAC;IACL,IAAI,EAAE,QAAQ;CACf,CAAC;AACW,QAAA,GAAG,GAAG;IACjB,EAAE,EAAE,CAAC;IACL,IAAI,EAAE,WAAW;CAClB,CAAC;AAGK,IAAM,GAAG,GAAT,MAAM,GAAG;IAEd,EAAE,CAAU;IAGZ,IAAI,CAAU;CACf,CAAA;AANY,kBAAG;AAEd;IADC,IAAA,gCAAsB,GAAE;;+BACb;AAGZ;IADC,IAAA,gBAAM,GAAE;;iCACK;cALH,GAAG;IADf,IAAA,gBAAM,GAAE;GACI,GAAG,CAMf;AAGM,IAAM,OAAO,GAAb,MAAM,OAAO;IAElB,EAAE,CAAU;IAGZ,OAAO,CAAU;IAGjB,mBAAmB,CAAQ;CAC5B,CAAA;AATY,0BAAO;AAElB;IADC,IAAA,gCAAsB,GAAE;;mCACb;AAGZ;IADC,IAAA,gBAAM,EAAC,KAAK,CAAC;;wCACG;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;8BACV,IAAI;oDAAC;kBARhB,OAAO;IADnB,IAAA,gBAAM,GAAE;GACI,OAAO,CASnB;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAClC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;CACvC;AAFD,gDAEC;AAEM,MAAM,mCAAmC,GAAG,GAAS,EAAE;IAC5D,MAAM,iBAAiB,GACrB,yBAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,mBAAmB,CAAC;IAErE,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC;AALW,QAAA,mCAAmC,uCAK9C;AAEK,MAAM,oCAAoC,GAAG,GAAS,EAAE;IAC7D,MAAM,iBAAiB,GACrB,yBAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,mBAAmB,CAAC;IAErE,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,CAAC;AACxC,CAAC,CAAC;AALW,QAAA,oCAAoC,wCAK/C"}
|
|
@@ -11,13 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var MigrationCheckerModule_1;
|
|
15
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
15
|
exports.MigrationCheckerModule = void 0;
|
|
17
16
|
const common_1 = require("@nestjs/common");
|
|
18
17
|
const core_1 = require("@rsdk/core");
|
|
19
18
|
const typeorm_1 = require("typeorm");
|
|
20
|
-
let MigrationCheckerModule =
|
|
19
|
+
let MigrationCheckerModule = class MigrationCheckerModule {
|
|
21
20
|
dataSource;
|
|
22
21
|
logger;
|
|
23
22
|
constructor(dataSource, logger) {
|
|
@@ -34,9 +33,10 @@ let MigrationCheckerModule = exports.MigrationCheckerModule = MigrationCheckerMo
|
|
|
34
33
|
}
|
|
35
34
|
}
|
|
36
35
|
};
|
|
37
|
-
exports.MigrationCheckerModule = MigrationCheckerModule
|
|
36
|
+
exports.MigrationCheckerModule = MigrationCheckerModule;
|
|
37
|
+
exports.MigrationCheckerModule = MigrationCheckerModule = __decorate([
|
|
38
38
|
(0, common_1.Module)({}),
|
|
39
|
-
__param(1, (0, core_1.InjectLogger)(
|
|
39
|
+
__param(1, (0, core_1.InjectLogger)(MigrationCheckerModule)),
|
|
40
40
|
__metadata("design:paramtypes", [typeorm_1.DataSource, Object])
|
|
41
41
|
], MigrationCheckerModule);
|
|
42
42
|
//# sourceMappingURL=migration-checker.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-checker.module.js","sourceRoot":"","sources":["../../src/modules/migration-checker.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migration-checker.module.js","sourceRoot":"","sources":["../../src/modules/migration-checker.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2CAAwC;AACxC,qCAA0C;AAE1C,qCAAwD;AAGjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEvB;IACsC;IAFhD,YACU,UAAsB,EACgB,MAAe;QADrD,eAAU,GAAV,UAAU,CAAY;QACgB,WAAM,GAAN,MAAM,CAAS;IAC5D,CAAC;IAEJ,KAAK,CAAC,sBAAsB;QAC1B,MAAM,iBAAiB,GAAG,IAAI,2BAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;QAElE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE;gBAC5C,UAAU;aACX,CAAC,CAAC;SACJ;IACH,CAAC;CACF,CAAA;AAhBY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,eAAM,EAAC,EAAE,CAAC;IAIN,WAAA,IAAA,mBAAY,EAAC,sBAAsB,CAAC,CAAA;qCADjB,oBAAU;GAFrB,sBAAsB,CAgBlC"}
|
|
@@ -15,14 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.TypeormLoggerAdapter = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const core_1 = require("@rsdk/core");
|
|
18
|
-
|
|
18
|
+
const db_1 = require("@rsdk/db");
|
|
19
|
+
let TypeormLoggerAdapter = class TypeormLoggerAdapter {
|
|
19
20
|
platformLogger;
|
|
20
21
|
constructor(platformLogger) {
|
|
21
22
|
this.platformLogger = platformLogger;
|
|
22
23
|
}
|
|
23
24
|
logQuery(query, parameters) {
|
|
24
25
|
const message = this.formatParts(`query: ${query}`, parameters && `parameters: ${JSON.stringify(parameters)}`);
|
|
25
|
-
|
|
26
|
+
if (query === db_1.HEALTH_CHECK_QUERY) {
|
|
27
|
+
this.platformLogger.trace(message);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
this.platformLogger.debug(message);
|
|
31
|
+
}
|
|
26
32
|
}
|
|
27
33
|
logMigration(message) {
|
|
28
34
|
this.platformLogger.info('Migration: ' + message);
|
|
@@ -53,6 +59,7 @@ let TypeormLoggerAdapter = exports.TypeormLoggerAdapter = class TypeormLoggerAda
|
|
|
53
59
|
return this.platformLogger[level](message);
|
|
54
60
|
}
|
|
55
61
|
};
|
|
62
|
+
exports.TypeormLoggerAdapter = TypeormLoggerAdapter;
|
|
56
63
|
exports.TypeormLoggerAdapter = TypeormLoggerAdapter = __decorate([
|
|
57
64
|
(0, common_1.Injectable)(),
|
|
58
65
|
__param(0, (0, core_1.InjectLogger)('TypeOrm')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-logger.adapter.js","sourceRoot":"","sources":["../../src/providers/typeorm-logger.adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAA0C;
|
|
1
|
+
{"version":3,"file":"typeorm-logger.adapter.js","sourceRoot":"","sources":["../../src/providers/typeorm-logger.adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAA0C;AAC1C,iCAA8C;AAKvC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACc;IAA7C,YAA6C,cAAuB;QAAvB,mBAAc,GAAd,cAAc,CAAS;IAAG,CAAC;IAExE,QAAQ,CAAC,KAAa,EAAE,UAAkB;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAC9B,UAAU,KAAK,EAAE,EACjB,UAAU,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAC1D,CAAC;QAEF,IAAI,KAAK,KAAK,uBAAkB,EAAE;YAChC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACpC;IACH,CAAC;IAED,YAAY,CAAC,OAAe;QAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,WAAW,CAAC,GAAG,KAAuC;QACpD,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,YAAY,CAAC,IAAY,EAAE,KAAa,EAAE,UAAkB;QAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAC9B,UAAU,KAAK,EAAE,EACjB,UAAU,IAAI,cAAc,GAAG,UAAU,EACzC,SAAS,IAAI,EAAE,CAChB,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,aAAa,CAAC,KAAqB,EAAE,KAAa,EAAE,UAAkB;QACpE,MAAM,KAAK,GAAG;YACZ,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACjC,UAAU,KAAK,EAAE;YACjB,UAAU,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;SAC1D,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC;QAE3C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,cAAc,CAAC,OAAe;QAC5B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,KAA8B,EAAE,OAAY;QAC9C,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;AAxDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAEE,WAAA,IAAA,mBAAY,EAAC,SAAS,CAAC,CAAA;;GADzB,oBAAoB,CAwDhC"}
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.TypeOrmPluginConfig = void 0;
|
|
13
13
|
const common_1 = require("@rsdk/common");
|
|
14
14
|
const core_1 = require("@rsdk/core");
|
|
15
|
-
let TypeOrmPluginConfig =
|
|
15
|
+
let TypeOrmPluginConfig = class TypeOrmPluginConfig extends core_1.Config {
|
|
16
16
|
url;
|
|
17
17
|
schema;
|
|
18
18
|
poolMin;
|
|
@@ -20,6 +20,7 @@ let TypeOrmPluginConfig = exports.TypeOrmPluginConfig = class TypeOrmPluginConfi
|
|
|
20
20
|
reconnectAttempts;
|
|
21
21
|
reconnectInterval;
|
|
22
22
|
};
|
|
23
|
+
exports.TypeOrmPluginConfig = TypeOrmPluginConfig;
|
|
23
24
|
__decorate([
|
|
24
25
|
(0, core_1.Property)('URL', new core_1.UrlParser(), {
|
|
25
26
|
description: 'Database server url',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.config.js","sourceRoot":"","sources":["../../src/providers/typeorm.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8C;AAC9C,qCASoB;AAOb,IAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"typeorm.config.js","sourceRoot":"","sources":["../../src/providers/typeorm.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8C;AAC9C,qCASoB;AAOb,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,aAAM;IAI7C,GAAG,CAAO;IASV,MAAM,CAAU;IAShB,OAAO,CAAU;IASjB,OAAO,CAAU;IAMjB,iBAAiB,CAAU;IAM3B,iBAAiB,CAAY;CAC9B,CAAA;AA5CY,kDAAmB;AAI9B;IAHC,IAAA,eAAQ,EAAC,KAAK,EAAE,IAAI,gBAAS,EAAE,EAAE;QAChC,WAAW,EAAE,qBAAqB;KACnC,CAAC;8BACI,GAAG;gDAAC;AASV;IAPC,IAAA,eAAQ,EAAC,QAAQ,EAAE,IAAI,mBAAY,EAAE,EAAE;QACtC,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;QACD,YAAY,EAAE,SAAS;KACxB,CAAC;;mDACc;AAShB;IAPC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrC,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;oDACe;AASjB;IAPC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrC,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;oDACe;AAMjB;IAJC,IAAA,eAAQ,EAAC,oBAAoB,EAAE,IAAI,gBAAS,EAAE,EAAE;QAC/C,YAAY,EAAE,MAAM,CAAC,iBAAiB;QACtC,WAAW,EAAE,oCAAoC;KAClD,CAAC;;8DACyB;AAM3B;IAJC,IAAA,eAAQ,EAAC,oBAAoB,EAAE,IAAI,qBAAc,EAAE,EAAE;QACpD,YAAY,EAAE,IAAI,iBAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAClC,WAAW,EAAE,uBAAuB;KACrC,CAAC;8BACkB,iBAAQ;8DAAC;8BA3ClB,mBAAmB;IAL/B,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,yBAAyB;QAC/B,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,OAAO,CAAC;QACnD,MAAM,EAAE,IAAI;KACb,CAAC;GACW,mBAAmB,CA4C/B"}
|
|
@@ -11,23 +11,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TypeOrmHealthIndicator = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
+
const common_2 = require("@rsdk/common");
|
|
14
15
|
const core_1 = require("@rsdk/core");
|
|
16
|
+
const db_1 = require("@rsdk/db");
|
|
15
17
|
const typeorm_1 = require("typeorm");
|
|
16
|
-
let TypeOrmHealthIndicator =
|
|
18
|
+
let TypeOrmHealthIndicator = class TypeOrmHealthIndicator {
|
|
17
19
|
manager;
|
|
18
20
|
constructor(manager) {
|
|
19
21
|
this.manager = manager;
|
|
20
22
|
}
|
|
21
23
|
async check() {
|
|
22
24
|
try {
|
|
23
|
-
|
|
24
|
-
return core_1.CheckResult.up(
|
|
25
|
+
await this.manager.query(db_1.HEALTH_CHECK_QUERY);
|
|
26
|
+
return core_1.CheckResult.up({ query: db_1.HEALTH_CHECK_QUERY });
|
|
25
27
|
}
|
|
26
28
|
catch (error) {
|
|
27
|
-
|
|
29
|
+
common_2.Assert.isError(error);
|
|
30
|
+
return core_1.CheckResult.down({ error: error.message });
|
|
28
31
|
}
|
|
29
32
|
}
|
|
30
33
|
};
|
|
34
|
+
exports.TypeOrmHealthIndicator = TypeOrmHealthIndicator;
|
|
31
35
|
exports.TypeOrmHealthIndicator = TypeOrmHealthIndicator = __decorate([
|
|
32
36
|
(0, common_1.Injectable)(),
|
|
33
37
|
(0, core_1.Indicator)('typeorm'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.healthcheck.js","sourceRoot":"","sources":["../../src/providers/typeorm.healthcheck.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;
|
|
1
|
+
{"version":3,"file":"typeorm.healthcheck.js","sourceRoot":"","sources":["../../src/providers/typeorm.healthcheck.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yCAAsC;AAEtC,qCAAoD;AACpD,iCAA8C;AAC9C,qCAAwC;AAIjC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACb;IAApB,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAAG,CAAC;IAE9C,KAAK,CAAC,KAAK;QACT,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAkB,CAAC,CAAC;YAE7C,OAAO,kBAAW,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,uBAAkB,EAAE,CAAC,CAAC;SACtD;QAAC,OAAO,KAAc,EAAE;YACvB,eAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACtB,OAAO,kBAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnD;IACH,CAAC;CACF,CAAA;AAbY,wDAAsB;iCAAtB,sBAAsB;IAFlC,IAAA,mBAAU,GAAE;IACZ,IAAA,gBAAS,EAAC,SAAS,CAAC;qCAEU,uBAAa;GAD/B,sBAAsB,CAalC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db.typeorm",
|
|
3
|
-
"version": "4.0.0-next.
|
|
3
|
+
"version": "4.0.0-next.3",
|
|
4
4
|
"description": "Typeorm module for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -14,16 +14,18 @@
|
|
|
14
14
|
"prepublishOnly": "npm run build"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@nestjs/common": "^10.
|
|
18
|
-
"@nestjs/core": "
|
|
17
|
+
"@nestjs/common": "^10.0.0",
|
|
18
|
+
"@nestjs/core": "^10.0.0",
|
|
19
19
|
"@nestjs/typeorm": "^10.0.0",
|
|
20
|
-
"@rsdk/common": "^
|
|
21
|
-
"@rsdk/common.nestjs": "^
|
|
22
|
-
"@rsdk/core": "^4.0.0-next.
|
|
23
|
-
"@rsdk/db": "^4.0.0-next.
|
|
24
|
-
"@rsdk/logging": "^4.0.0-next.
|
|
25
|
-
"@rsdk/nest-tools": "^
|
|
20
|
+
"@rsdk/common": "^4.0.0-next.3",
|
|
21
|
+
"@rsdk/common.nestjs": "^4.0.0-next.3",
|
|
22
|
+
"@rsdk/core": "^4.0.0-next.3",
|
|
23
|
+
"@rsdk/db": "^4.0.0-next.3",
|
|
24
|
+
"@rsdk/logging": "^4.0.0-next.3",
|
|
25
|
+
"@rsdk/nest-tools": "^4.0.0-next.2",
|
|
26
|
+
"reflect-metadata": "^0.1.13",
|
|
27
|
+
"rxjs": "^7.0.0",
|
|
26
28
|
"typeorm": "^0.3.12"
|
|
27
29
|
},
|
|
28
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "313c39a379ea9ace9d94939223a53c46c12d77f9"
|
|
29
31
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Injectable } from '@nestjs/common';
|
|
2
2
|
import { InjectLogger } from '@rsdk/core';
|
|
3
|
+
import { HEALTH_CHECK_QUERY } from '@rsdk/db';
|
|
3
4
|
import { ILogger } from '@rsdk/logging';
|
|
4
5
|
import type { Logger } from 'typeorm';
|
|
5
6
|
|
|
@@ -13,7 +14,11 @@ export class TypeormLoggerAdapter implements Logger {
|
|
|
13
14
|
parameters && `parameters: ${JSON.stringify(parameters)}`,
|
|
14
15
|
);
|
|
15
16
|
|
|
16
|
-
|
|
17
|
+
if (query === HEALTH_CHECK_QUERY) {
|
|
18
|
+
this.platformLogger.trace(message);
|
|
19
|
+
} else {
|
|
20
|
+
this.platformLogger.debug(message);
|
|
21
|
+
}
|
|
17
22
|
}
|
|
18
23
|
|
|
19
24
|
logMigration(message: string): any {
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Injectable } from '@nestjs/common';
|
|
2
|
+
import { Assert } from '@rsdk/common';
|
|
2
3
|
import type { HealthIndicator } from '@rsdk/core';
|
|
3
4
|
import { CheckResult, Indicator } from '@rsdk/core';
|
|
5
|
+
import { HEALTH_CHECK_QUERY } from '@rsdk/db';
|
|
4
6
|
import { EntityManager } from 'typeorm';
|
|
5
7
|
|
|
6
8
|
@Injectable()
|
|
@@ -10,11 +12,12 @@ export class TypeOrmHealthIndicator implements HealthIndicator {
|
|
|
10
12
|
|
|
11
13
|
async check(): Promise<CheckResult> {
|
|
12
14
|
try {
|
|
13
|
-
|
|
15
|
+
await this.manager.query(HEALTH_CHECK_QUERY);
|
|
14
16
|
|
|
15
|
-
return CheckResult.up(
|
|
16
|
-
} catch (error:
|
|
17
|
-
|
|
17
|
+
return CheckResult.up({ query: HEALTH_CHECK_QUERY });
|
|
18
|
+
} catch (error: unknown) {
|
|
19
|
+
Assert.isError(error);
|
|
20
|
+
return CheckResult.down({ error: error.message });
|
|
18
21
|
}
|
|
19
22
|
}
|
|
20
23
|
}
|