@rsdk/db.typeorm 5.4.0-next.1 → 5.4.0-next.11
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 +54 -0
- package/dist/internal/context.js.map +1 -1
- package/dist/internal/initializer.js +1 -3
- package/dist/internal/initializer.js.map +1 -1
- package/dist/providers/typeorm-override-entities.data-source-factory.js.map +1 -1
- package/dist/typeorm.plugin.js +5 -2
- package/dist/typeorm.plugin.js.map +1 -1
- package/package.json +2 -2
- package/src/internal/context.ts +2 -0
- package/src/internal/initializer.ts +2 -3
- package/src/internal/test/strategy.test.e2e.ts +4 -0
- package/src/providers/typeorm-override-entities.data-source-factory.ts +1 -0
- package/src/typeorm.plugin.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,52 @@
|
|
|
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
|
+
## [5.4.0-next.11](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.10...v5.4.0-next.11) (2024-12-04)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
9
|
+
|
|
10
|
+
## [5.4.0-next.10](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.9...v5.4.0-next.10) (2024-12-03)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
13
|
+
|
|
14
|
+
## [5.4.0-next.9](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.8...v5.4.0-next.9) (2024-12-02)
|
|
15
|
+
|
|
16
|
+
## [5.3.1-rc.1](https://github.com/R-Vision/rsdk/compare/v5.3.1-rc.0...v5.3.1-rc.1) (2024-11-28)
|
|
17
|
+
|
|
18
|
+
## [5.3.1-rc.0](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.6...v5.3.1-rc.0) (2024-11-28)
|
|
19
|
+
|
|
20
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
21
|
+
|
|
22
|
+
## [5.4.0-next.8](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.7...v5.4.0-next.8) (2024-11-28)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
25
|
+
|
|
26
|
+
## [5.4.0-next.7](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.6...v5.4.0-next.7) (2024-11-28)
|
|
27
|
+
|
|
28
|
+
### Features
|
|
29
|
+
|
|
30
|
+
* eslint rule lines-around-comment ([65083bd](https://github.com/R-Vision/rsdk/commit/65083bd2e084344e08f2124e39afbbc23fdaa4f4))
|
|
31
|
+
|
|
32
|
+
## [5.4.0-next.6](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.5...v5.4.0-next.6) (2024-11-28)
|
|
33
|
+
|
|
34
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
35
|
+
|
|
36
|
+
## [5.4.0-next.5](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.4...v5.4.0-next.5) (2024-11-28)
|
|
37
|
+
|
|
38
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
39
|
+
|
|
40
|
+
## [5.4.0-next.4](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.3...v5.4.0-next.4) (2024-11-27)
|
|
41
|
+
|
|
42
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
43
|
+
|
|
44
|
+
## [5.4.0-next.3](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.2...v5.4.0-next.3) (2024-11-25)
|
|
45
|
+
|
|
46
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
47
|
+
|
|
48
|
+
## [5.4.0-next.2](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.1...v5.4.0-next.2) (2024-11-25)
|
|
49
|
+
|
|
50
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
51
|
+
|
|
6
52
|
## [5.4.0-next.1](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.0...v5.4.0-next.1) (2024-11-08)
|
|
7
53
|
|
|
8
54
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
@@ -11,6 +57,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
11
57
|
|
|
12
58
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
13
59
|
|
|
60
|
+
## [5.3.1-rc.1](https://github.com/R-Vision/rsdk/compare/v5.3.1-rc.0...v5.3.1-rc.1) (2024-11-28)
|
|
61
|
+
|
|
62
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
63
|
+
|
|
64
|
+
## [5.3.1-rc.0](https://github.com/R-Vision/rsdk/compare/v5.3.0...v5.3.1-rc.0) (2024-11-28)
|
|
65
|
+
|
|
66
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
67
|
+
|
|
14
68
|
## [5.3.0](https://github.com/R-Vision/rsdk/compare/v5.3.0-next.4...v5.3.0) (2024-11-08)
|
|
15
69
|
|
|
16
70
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAgD;AAChD,iCAAuC;AAIvC,oCAAoE;AAEpE,6CAOsB;AAEtB,MAAa,cAAe,SAAQ,gBAA2B;IACpD,eAAe,GAAG,uBAAe,CAAC;IAE3C;;;OAGG;IACK,YAAY,CAAe;IAEnC;;;OAGG;IACK,2BAA2B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,11 +67,9 @@ class Initializer {
|
|
|
67
67
|
/**
|
|
68
68
|
* Если кто-то обратился к любому queryRunner во время исполнения функции контекста, а в контексте ещё нет queryRunner
|
|
69
69
|
* Этот queryRunner добавляем в контекст
|
|
70
|
+
* Дополнительно проверяем не является ли этот queryRunner релизнутым/с активной транзакцией
|
|
70
71
|
*/
|
|
71
72
|
if (!context.queryRunner &&
|
|
72
|
-
/**
|
|
73
|
-
* Дополнительно проверяем не является ли этот queryRunner релизнутым/с активной транзакцией
|
|
74
|
-
*/
|
|
75
73
|
target.isTransactionActive &&
|
|
76
74
|
!target.isReleased) {
|
|
77
75
|
context.attach(originalQueryRunner);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../src/internal/initializer.ts"],"names":[],"mappings":";;;AAAA,iCAA0C;AAE1C,qCAAqC;AAGrC,6CAA6E;AAE7E,MAAM,yBAAyB,GAAG,oBAAU,CAAC,SAAS,CAAC,iBAAiB,CAAC;AAEzE,MAAa,WAAW;IACtB,MAAM,CAAU,OAAO,GAAG,IAAI,mBAAc,EAAkB,CAAC;IAE/D;;OAEG;IACH,MAAM,CAAC,UAAU;QACf,MAAM,CAAC,cAAc,CAAC,oBAAU,CAAC,SAAS,EAAE,mBAAmB,EAAE;YAC/D,KAAK,EAAE,WAAW,CAAC,wBAAwB;SAC5C,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,wBAAwB,CAErC,GAAG,IAAW;QAEd,MAAM,mBAAmB,GAAgB,yBAAyB,CAAC,IAAI,CACrE,IAAI,EACJ,GAAG,IAAI,CACR,CAAC;QACF,4DAA4D;QAC5D,MAAM,UAAU,GAAG,IAAI,CAAC;QACxB,MAAM,kBAAkB,GAAG,IAAI,KAAK,CAAC,mBAAmB,EAAE;YACxD,GAAG,CAAC,MAAmB,EAAE,WAA8B;gBACrD,MAAM,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;gBAEpD;;;mBAGG;gBACH,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,OAAO,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAC/C,CAAC;gBAED;;;;;;mBAMG;gBACH;;mBAEG;gBACH;;;;;;;;;;;;;;mBAcG;gBACH,IAAI,OAAO,uBAAuB,KAAK,UAAU,EAAE,CAAC;oBAClD,OAAO,WAAW,CAAC,gBAAgB,CACjC,UAAU,EACV,uBAAuB,EACvB,MAAM,CACP,CAAC;gBACJ,CAAC;gBACD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,uBAAuB,CAAC;gBACjC,CAAC;gBACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;oBACvB,MAAM,IAAI,8BAAiB,EAAE,CAAC;gBAChC,CAAC;
|
|
1
|
+
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../src/internal/initializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-override-entities.data-source-factory.js","sourceRoot":"","sources":["../../src/providers/typeorm-override-entities.data-source-factory.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAIjD,qCAAqC;AAErC,qFAAkF;AAElF,mFAAgF;AAEhF,MAAa,wCAAwC;IACnD,MAAM,CAAC,MAAM,CAAC,iBAAoC;QAChD,gFAAgF;QAChF,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAChC,OAAO,IAAI,oBAAU,CAAC,iBAAiB,CAAC,CAAC;QAC3C,CAAC;QAED,gEAAgE;QAChE,2CAA2C;QAE3C,iCAAiC;QACjC,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,MAAM,wBAAwB,GAC5B,IAAI,CAAC,4CAA4C,CAC/C,iBAAiB,CAAC,QAAQ,CAC3B,CAAC;YAEJ,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CACzD,CAAC,MAAM,EAAE,EAAE,CACT,CAAC,IAAI,CAAC,wBAAwB,CAC5B,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,EACvC,wBAAwB,CACzB,CACJ,CAAC;YAEF,OAAO,IAAI,oBAAU,CAAC;gBACpB,GAAG,iBAAiB;gBACpB,QAAQ,EAAE,iBAAiB;aAC5B,CAAC,CAAC;QACL,CAAC;
|
|
1
|
+
{"version":3,"file":"typeorm-override-entities.data-source-factory.js","sourceRoot":"","sources":["../../src/providers/typeorm-override-entities.data-source-factory.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAIjD,qCAAqC;AAErC,qFAAkF;AAElF,mFAAgF;AAEhF,MAAa,wCAAwC;IACnD,MAAM,CAAC,MAAM,CAAC,iBAAoC;QAChD,gFAAgF;QAChF,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAChC,OAAO,IAAI,oBAAU,CAAC,iBAAiB,CAAC,CAAC;QAC3C,CAAC;QAED,gEAAgE;QAChE,2CAA2C;QAE3C,iCAAiC;QACjC,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,MAAM,wBAAwB,GAC5B,IAAI,CAAC,4CAA4C,CAC/C,iBAAiB,CAAC,QAAQ,CAC3B,CAAC;YAEJ,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CACzD,CAAC,MAAM,EAAE,EAAE,CACT,CAAC,IAAI,CAAC,wBAAwB,CAC5B,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,EACvC,wBAAwB,CACzB,CACJ,CAAC;YAEF,OAAO,IAAI,oBAAU,CAAC;gBACpB,GAAG,iBAAiB;gBACpB,QAAQ,EAAE,iBAAiB;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,oCAAoC;QACpC,MAAM,wBAAwB,GAC5B,IAAI,CAAC,gDAAgD,CAAC,iBAAiB,CAAC,CAAC;QAE3E,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAC1C,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAC/C,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CACjB,CAAC,IAAI,CAAC,wBAAwB,CAC5B,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,EACvC,wBAAwB,CACzB,CACJ,CACF,CAAC;QAEF,OAAO,IAAI,oBAAU,CAAC;YACpB,GAAG,iBAAiB;YACpB,QAAQ,EAAE,iBAAiB;SAC5B,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,gDAAgD,CAC7D,iBAAoC;QAEpC,MAAM,wBAAwB,GAG1B,EAAE,CAAC;QAEP,KAAK,MAAM,MAAM,IAAI,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAChD,MAAM,sBAAsB,GAAG,IAAA,qDAAyB,EAAC,MAAM,CAAC,CAAC;YACjE,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,wBAAwB,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACjE,CAAC;QACH,CAAC;QACD,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,4CAA4C,CACzD,QAA8C;QAE9C,MAAM,wBAAwB,GAG1B,EAAE,CAAC;QAEP,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,sBAAsB,GAAG,IAAA,qDAAyB,EAAC,MAAM,CAAC,CAAC;YACjE,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,wBAAwB,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACjE,CAAC;QACH,CAAC;QACD,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,wBAAwB,CACrC,qBAAuD,EACvD,wBAGC;QAED,OAAO,CACL,qBAAqB,EAAE,IAAI;YAC3B,wBAAwB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CACrD,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,0BAA0B,CACvC,MAAwC;QAExC,OAAO,IAAA,mDAAwB,EAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;CACF;AAvGD,4FAuGC"}
|
package/dist/typeorm.plugin.js
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
3
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
+
};
|
|
3
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
7
|
exports.TypeOrmPlugin = void 0;
|
|
5
8
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
6
9
|
const core_1 = require("@rsdk/core");
|
|
7
10
|
const logging_1 = require("@rsdk/logging");
|
|
8
|
-
const node_path_1 = require("node:path");
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
9
12
|
const exceptions_1 = require("./internal/exceptions");
|
|
10
13
|
const initializer_1 = require("./internal/initializer");
|
|
11
14
|
const migration_checker_module_1 = require("./modules/migration-checker.module");
|
|
@@ -82,7 +85,7 @@ class TypeOrmPlugin {
|
|
|
82
85
|
return [new typeorm_errors_transformer_1.TypeOrmErrorTransformer()];
|
|
83
86
|
}
|
|
84
87
|
getMigrationsOption() {
|
|
85
|
-
return [
|
|
88
|
+
return [node_path_1.default.resolve(process.cwd(), 'dist/typeorm/migrations/**.js')];
|
|
86
89
|
}
|
|
87
90
|
}
|
|
88
91
|
exports.TypeOrmPlugin = TypeOrmPlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":";AAAA,iDAAiD
|
|
1
|
+
{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAIjD,6CAAgD;AAOhD,qCAAsC;AACtC,2CAA8C;AAC9C,0DAA6B;AAG7B,sDAAgE;AAChE,wDAAqD;AACrD,iFAA4E;AAC5E,6HAAqH;AACrH,2CAIqB;AACrB,6EAAuE;AAGvE,MAAa,aAAa;IAMK;IALrB,MAAM,CAAU,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAErE;;OAEG;IACH,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QACxD,yBAAW,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC;IACjC,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO;YACL,uBAAa,CAAC,YAAY,CAAC;gBACzB,OAAO,EAAE;oBACP;wBACE,MAAM,EAAE,uBAAa;wBACrB,SAAS,EAAE,CAAC,kCAAsB,EAAE,gCAAoB,CAAC;wBACzD,OAAO,EAAE,CAAC,gCAAoB,CAAC;qBAChC;iBACF;gBACD,MAAM,EAAE,CAAC,+BAAmB,EAAE,gCAAoB,EAAE,eAAQ,CAAC;gBAC7D,UAAU,EAAE,CACV,MAA2B,EAC3B,MAA4B,EAC5B,OAAe,EACO,EAAE,CAAC,CAAC;oBAC1B;;;;uBAIG;oBACH,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;oBACvB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;oBAC1B,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI;wBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;qBACtB,CAAC;oBACF,MAAM;oBACN,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACjD,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ;oBAChC,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE;oBAC7C,aAAa,EAAE,MAAM,CAAC,iBAAiB;oBACvC,eAAe,EAAE,OAAO,GAAG,UAAU;oBACrC,KAAK,EAAE;wBACL,GAAG,EAAE,MAAM,CAAC,OAAO;wBACnB,GAAG,EAAE,MAAM,CAAC,OAAO;qBACpB;oBACD,UAAU;oBACV,mBAAmB,EAAE,oBAAoB;oBACzC,GAAI,IAAI,CAAC,OAAO,CAAC,cAAsB;iBACxC,CAAC;gBACF,iBAAiB,EAAE,CAAC,OAA2B,EAAE,EAAE;oBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,MAAM,IAAI,oCAAuB,EAAE,CAAC;oBACtC,CAAC;oBACD,OAAO,wFAAwC,CAAC,MAAM,CACpD,OAAO,CACR,CAAC,UAAU,EAAE,CAAC;gBACjB,CAAC;aACF,CAAC;YACF,iDAAsB;SACvB,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,oDAAuB,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,mBAAmB;QACzB,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC,CAAC,CAAC;IACxE,CAAC;;AAlFH,sCAmFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db.typeorm",
|
|
3
|
-
"version": "5.4.0-next.
|
|
3
|
+
"version": "5.4.0-next.11",
|
|
4
4
|
"description": "TypeOrm module for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -28,5 +28,5 @@
|
|
|
28
28
|
"rxjs": "^7.8.1",
|
|
29
29
|
"typeorm": "^0.3.12"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "aeefd240acea47a74d5eb5568fdf88ba8df533ae"
|
|
32
32
|
}
|
package/src/internal/context.ts
CHANGED
|
@@ -28,6 +28,7 @@ export class TypeOrmContext extends BaseContext<IsolationLevel> {
|
|
|
28
28
|
* @private
|
|
29
29
|
*/
|
|
30
30
|
private transactionInitializedDepth = 0;
|
|
31
|
+
|
|
31
32
|
/**
|
|
32
33
|
* Глубина вложенности
|
|
33
34
|
* Не путать с индексом вложенности
|
|
@@ -146,6 +147,7 @@ export class TypeOrmContext extends BaseContext<IsolationLevel> {
|
|
|
146
147
|
this.transactionInitializedDepth = this.nestDepth;
|
|
147
148
|
|
|
148
149
|
const isReleased = this.nestDepth === 0;
|
|
150
|
+
|
|
149
151
|
/**
|
|
150
152
|
* В обоих случаях в идеале завершать работу приложения так как часть операция может быть не выполнена, хотя должна была и наоборот
|
|
151
153
|
* И в качестве бонуса получим висящее соединение к СУБД которое нельзя использовать
|
|
@@ -80,15 +80,14 @@ export class Initializer {
|
|
|
80
80
|
if (context.isReleased) {
|
|
81
81
|
throw new ContextIsReleased();
|
|
82
82
|
}
|
|
83
|
+
|
|
83
84
|
/**
|
|
84
85
|
* Если кто-то обратился к любому queryRunner во время исполнения функции контекста, а в контексте ещё нет queryRunner
|
|
85
86
|
* Этот queryRunner добавляем в контекст
|
|
87
|
+
* Дополнительно проверяем не является ли этот queryRunner релизнутым/с активной транзакцией
|
|
86
88
|
*/
|
|
87
89
|
if (
|
|
88
90
|
!context.queryRunner &&
|
|
89
|
-
/**
|
|
90
|
-
* Дополнительно проверяем не является ли этот queryRunner релизнутым/с активной транзакцией
|
|
91
|
-
*/
|
|
92
91
|
target.isTransactionActive &&
|
|
93
92
|
!target.isReleased
|
|
94
93
|
) {
|
|
@@ -880,10 +880,12 @@ describe('REQUIRES_NEW', () => {
|
|
|
880
880
|
it('correct run new transaction', async () => {
|
|
881
881
|
const testedFunc = async (): Promise<void> => {
|
|
882
882
|
contextTransactionMustNotInitialized();
|
|
883
|
+
|
|
883
884
|
/**
|
|
884
885
|
* Не должно задействовать текущее соединение
|
|
885
886
|
*/
|
|
886
887
|
await contextDoSuccessful();
|
|
888
|
+
|
|
887
889
|
/**
|
|
888
890
|
* Убеждаемся в том что текущий контекст так и не был проинициализирован
|
|
889
891
|
*/
|
|
@@ -900,6 +902,7 @@ describe('REQUIRES_NEW', () => {
|
|
|
900
902
|
const cats = await fetchCats();
|
|
901
903
|
|
|
902
904
|
expect(cats).toEqual([cat]);
|
|
905
|
+
|
|
903
906
|
/**
|
|
904
907
|
* Исключения не будет так как будет использовано другое соединение
|
|
905
908
|
*/
|
|
@@ -1035,6 +1038,7 @@ describe('SUPPORTS', () => {
|
|
|
1035
1038
|
it('correct run for incompatible isolation levels', async () => {
|
|
1036
1039
|
const testedFunc = async (): Promise<void> => {
|
|
1037
1040
|
await createCat();
|
|
1041
|
+
|
|
1038
1042
|
/**
|
|
1039
1043
|
* Всё должно сработать так как мы создаём новую транзакцию
|
|
1040
1044
|
*/
|
package/src/typeorm.plugin.ts
CHANGED
|
@@ -11,7 +11,7 @@ import type {
|
|
|
11
11
|
} from '@rsdk/core';
|
|
12
12
|
import { APP_NAME } from '@rsdk/core';
|
|
13
13
|
import { LoggerFactory } from '@rsdk/logging';
|
|
14
|
-
import
|
|
14
|
+
import path from 'node:path';
|
|
15
15
|
import type { DataSourceOptions } from 'typeorm';
|
|
16
16
|
|
|
17
17
|
import { DatasourceOptionsNotSet } from './internal/exceptions';
|
|
@@ -107,6 +107,6 @@ export class TypeOrmPlugin implements PlatformAppPlugin {
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
private getMigrationsOption(): string[] {
|
|
110
|
-
return [resolve(process.cwd(), 'dist/typeorm/migrations/**.js')];
|
|
110
|
+
return [path.resolve(process.cwd(), 'dist/typeorm/migrations/**.js')];
|
|
111
111
|
}
|
|
112
112
|
}
|