@rsdk/db.knex 4.0.1-next.1 → 4.0.1
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 +10 -0
- package/dist/internal/context.js +17 -1
- package/dist/internal/context.js.map +1 -1
- package/dist/internal/exceptions.d.ts +2 -1
- package/dist/internal/exceptions.js +4 -2
- package/dist/internal/exceptions.js.map +1 -1
- package/jest.config.js +4 -1
- package/package.json +7 -6
- package/src/internal/context.ts +3 -1
- package/src/internal/exceptions.ts +9 -2
- package/src/internal/test.e2e/layer-leak.test.ts +62 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
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.1](https://github.com/R-Vision/rsdk/compare/v4.0.1-next.2...v4.0.1) (2023-12-07)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/db.knex
|
|
9
|
+
|
|
10
|
+
## [4.0.1-next.2](https://github.com/R-Vision/rsdk/compare/v4.0.1-next.1...v4.0.1-next.2) (2023-12-07)
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* **db:** added queued initialization db context ([#169](https://github.com/R-Vision/rsdk/issues/169)) ([ea481ed](https://github.com/R-Vision/rsdk/commit/ea481edce9bbc7bd702fc046a37fb5a5580a88dd))
|
|
15
|
+
|
|
6
16
|
## [4.0.1-next.1](https://github.com/R-Vision/rsdk/compare/v4.0.0...v4.0.1-next.1) (2023-12-06)
|
|
7
17
|
|
|
8
18
|
**Note:** Version bump only for package @rsdk/db.knex
|
package/dist/internal/context.js
CHANGED
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
5
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
15
|
exports.KnexContext = void 0;
|
|
7
16
|
/* eslint-disable @typescript-eslint/ban-ts-comment */
|
|
17
|
+
const common_node_1 = require("@rsdk/common.node");
|
|
8
18
|
const db_1 = require("@rsdk/db");
|
|
9
19
|
/**
|
|
10
20
|
ts-ignore потому что в тайпингах этого нет, а тайпингов нет потому что knex ~~говно~~ написан на js, и тайпинги написаны руками,
|
|
@@ -178,7 +188,7 @@ class KnexContext extends db_1.BaseContext {
|
|
|
178
188
|
/**
|
|
179
189
|
* Не должно быть ситуаций при которых мы попадаем сюда с количеством слоев больше чем уровень вложенности
|
|
180
190
|
*/
|
|
181
|
-
throw new exceptions_1.LayersCountMoreThanNestDepth();
|
|
191
|
+
throw new exceptions_1.LayersCountMoreThanNestDepth(this);
|
|
182
192
|
}
|
|
183
193
|
this.nestDepth -= 1;
|
|
184
194
|
/**
|
|
@@ -226,4 +236,10 @@ class KnexContext extends db_1.BaseContext {
|
|
|
226
236
|
}
|
|
227
237
|
}
|
|
228
238
|
exports.KnexContext = KnexContext;
|
|
239
|
+
__decorate([
|
|
240
|
+
(0, common_node_1.Concurrency)(),
|
|
241
|
+
__metadata("design:type", Function),
|
|
242
|
+
__metadata("design:paramtypes", [Object]),
|
|
243
|
+
__metadata("design:returntype", Promise)
|
|
244
|
+
], KnexContext.prototype, "initialize", null);
|
|
229
245
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { InternalException } from '@rsdk/core';
|
|
2
|
+
import type { KnexContext } from './context';
|
|
2
3
|
/**
|
|
3
4
|
* Попытка начать выполнения функции в контексте при неподходящем состоянии контекста
|
|
4
5
|
*/
|
|
@@ -23,7 +24,7 @@ export declare class MustReleased extends InternalException {
|
|
|
23
24
|
* Проинициализировано больше слоев чем текущий уровень вложенности
|
|
24
25
|
*/
|
|
25
26
|
export declare class LayersCountMoreThanNestDepth extends FinalizeException {
|
|
26
|
-
constructor();
|
|
27
|
+
constructor(knexContext: KnexContext);
|
|
27
28
|
}
|
|
28
29
|
export declare class ContextMustBeProvided extends InternalException {
|
|
29
30
|
constructor();
|
|
@@ -36,8 +36,10 @@ exports.MustReleased = MustReleased;
|
|
|
36
36
|
* Проинициализировано больше слоев чем текущий уровень вложенности
|
|
37
37
|
*/
|
|
38
38
|
class LayersCountMoreThanNestDepth extends FinalizeException {
|
|
39
|
-
constructor() {
|
|
40
|
-
super('Layers count more than nest depth'
|
|
39
|
+
constructor(knexContext) {
|
|
40
|
+
super('Layers count more than nest depth, maybe few requests runned in parallel or async', {
|
|
41
|
+
cause: { knexContext },
|
|
42
|
+
});
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
exports.LayersCountMoreThanNestDepth = LayersCountMoreThanNestDepth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/internal/exceptions.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;
|
|
1
|
+
{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/internal/exceptions.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAI/C;;GAEG;AACH,MAAa,oCAAqC,SAAQ,wBAAiB;IACzE;QACE,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,oFAIC;AAED;;GAEG;AACH,MAAa,sBAAuB,SAAQ,wBAAiB;IAC3D;QACE,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACrC,CAAC;CACF;AAJD,wDAIC;AAED,MAAa,iBAAkB,SAAQ,wBAAiB;CAAG;AAA3D,8CAA2D;AAE3D;;GAEG;AACH,MAAa,YAAa,SAAQ,wBAAiB;IACjD;QACE,KAAK,CAAC,4CAA4C,CAAC,CAAC;IACtD,CAAC;CACF;AAJD,oCAIC;AAED;;GAEG;AACH,MAAa,4BAA6B,SAAQ,iBAAiB;IACjE,YAAY,WAAwB;QAClC,KAAK,CACH,mFAAmF,EACnF;YACE,KAAK,EAAE,EAAE,WAAW,EAAE;SACvB,CACF,CAAC;IACJ,CAAC;CACF;AATD,oEASC;AAED,MAAa,qBAAsB,SAAQ,wBAAiB;IAC1D;QACE,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACpC,CAAC;CACF;AAJD,sDAIC;AAED;;GAEG;AACH,MAAa,iBAAkB,SAAQ,wBAAiB;IACtD;QACE,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACzC,CAAC;CACF;AAJD,8CAIC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,iBAAkB,SAAQ,wBAAiB;IACtD;QACE,KAAK,CACH,yGAAyG,CAC1G,CAAC;IACJ,CAAC;CACF;AAND,8CAMC;AAED,MAAa,iCAAkC,SAAQ,wBAAiB;IACtE;QACE,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACtE,CAAC;CACF;AAJD,8EAIC"}
|
package/jest.config.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db.knex",
|
|
3
|
-
"version": "4.0.1
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"description": "Knex integration for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -16,13 +16,14 @@
|
|
|
16
16
|
"peerDependencies": {
|
|
17
17
|
"@nestjs/common": "^10.0.0",
|
|
18
18
|
"@nestjs/core": "^10.0.0",
|
|
19
|
-
"@rsdk/common": "^4.0.1
|
|
20
|
-
"@rsdk/
|
|
21
|
-
"@rsdk/
|
|
22
|
-
"@rsdk/
|
|
19
|
+
"@rsdk/common": "^4.0.1",
|
|
20
|
+
"@rsdk/common.node": "^4.0.1",
|
|
21
|
+
"@rsdk/core": "^4.0.1",
|
|
22
|
+
"@rsdk/db": "^4.0.1",
|
|
23
|
+
"@rsdk/logging": "^4.0.1",
|
|
23
24
|
"knex": "^2.4.2",
|
|
24
25
|
"reflect-metadata": "^0.1.13",
|
|
25
26
|
"rxjs": "^7.0.0"
|
|
26
27
|
},
|
|
27
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "87487d968b88af4389a85c424f10ed841c19b91e"
|
|
28
29
|
}
|
package/src/internal/context.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/ban-ts-comment */
|
|
2
|
+
import { Concurrency } from '@rsdk/common.node';
|
|
2
3
|
import { BaseContext } from '@rsdk/db';
|
|
3
4
|
import type { Knex } from 'knex';
|
|
4
5
|
/**
|
|
@@ -134,6 +135,7 @@ export class KnexContext extends BaseContext<IsolationLevel> {
|
|
|
134
135
|
* Метод инициализирует необходимые слои для корректной работы savepoint
|
|
135
136
|
* @param settledRunner
|
|
136
137
|
*/
|
|
138
|
+
@Concurrency()
|
|
137
139
|
async initialize(settledRunner: KnexRunner): Promise<void> {
|
|
138
140
|
if (this.suspended) {
|
|
139
141
|
if (this.layers.length === 1) {
|
|
@@ -241,7 +243,7 @@ export class KnexContext extends BaseContext<IsolationLevel> {
|
|
|
241
243
|
/**
|
|
242
244
|
* Не должно быть ситуаций при которых мы попадаем сюда с количеством слоев больше чем уровень вложенности
|
|
243
245
|
*/
|
|
244
|
-
throw new LayersCountMoreThanNestDepth();
|
|
246
|
+
throw new LayersCountMoreThanNestDepth(this);
|
|
245
247
|
}
|
|
246
248
|
|
|
247
249
|
this.nestDepth -= 1;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { InternalException } from '@rsdk/core';
|
|
2
2
|
|
|
3
|
+
import type { KnexContext } from './context';
|
|
4
|
+
|
|
3
5
|
/**
|
|
4
6
|
* Попытка начать выполнения функции в контексте при неподходящем состоянии контекста
|
|
5
7
|
*/
|
|
@@ -33,8 +35,13 @@ export class MustReleased extends InternalException {
|
|
|
33
35
|
* Проинициализировано больше слоев чем текущий уровень вложенности
|
|
34
36
|
*/
|
|
35
37
|
export class LayersCountMoreThanNestDepth extends FinalizeException {
|
|
36
|
-
constructor() {
|
|
37
|
-
super(
|
|
38
|
+
constructor(knexContext: KnexContext) {
|
|
39
|
+
super(
|
|
40
|
+
'Layers count more than nest depth, maybe few requests runned in parallel or async',
|
|
41
|
+
{
|
|
42
|
+
cause: { knexContext },
|
|
43
|
+
},
|
|
44
|
+
);
|
|
38
45
|
}
|
|
39
46
|
}
|
|
40
47
|
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/* eslint-disable unicorn/consistent-function-scoping,unicorn/catch-error-name */
|
|
2
|
+
import { TransactionRunner } from '@rsdk/db';
|
|
3
|
+
import type { Knex } from 'knex';
|
|
4
|
+
import KnexInitializer from 'knex';
|
|
5
|
+
import * as assert from 'node:assert';
|
|
6
|
+
import * as process from 'node:process';
|
|
7
|
+
import { Client } from 'pg';
|
|
8
|
+
|
|
9
|
+
import { Initializer } from '../initializer';
|
|
10
|
+
import { KnexTransactionalStrategy } from '../strategy';
|
|
11
|
+
|
|
12
|
+
const fetchCats = async (): Promise<void> => await knex.from('cat');
|
|
13
|
+
|
|
14
|
+
const runner = new TransactionRunner(new KnexTransactionalStrategy());
|
|
15
|
+
let knex: Knex;
|
|
16
|
+
|
|
17
|
+
const schemaName = 'knex';
|
|
18
|
+
|
|
19
|
+
const dburl: string = process.env.DB_URL as string;
|
|
20
|
+
const setupSchema = async (): Promise<void> => {
|
|
21
|
+
const client = new Client(dburl);
|
|
22
|
+
|
|
23
|
+
await client.connect();
|
|
24
|
+
await client.query(`CREATE SCHEMA IF NOT EXISTS ${schemaName}`);
|
|
25
|
+
await client.end();
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
beforeAll(setupSchema);
|
|
29
|
+
|
|
30
|
+
beforeAll(async () => {
|
|
31
|
+
Initializer.initialize();
|
|
32
|
+
|
|
33
|
+
const dbtype: string | Knex.Client = process.env.DB_TYPE as string;
|
|
34
|
+
|
|
35
|
+
assert.ok(dbtype);
|
|
36
|
+
assert.ok(dburl);
|
|
37
|
+
knex = KnexInitializer({
|
|
38
|
+
searchPath: [schemaName],
|
|
39
|
+
client: dbtype as 'postgres',
|
|
40
|
+
connection: dburl as '',
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
beforeEach(async () => {
|
|
45
|
+
await knex.schema.withSchema('knex').dropTableIfExists('cat');
|
|
46
|
+
await knex.schema.withSchema('knex').createTable('cat', (qb) => {
|
|
47
|
+
qb.increments('id');
|
|
48
|
+
qb.string('name');
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
afterAll(async () => {
|
|
53
|
+
await knex.destroy();
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('should run with Promise.all', async () => {
|
|
57
|
+
await runner.transactional(async () => {
|
|
58
|
+
const cats = await Promise.all([fetchCats(), fetchCats()]);
|
|
59
|
+
|
|
60
|
+
expect(cats).toEqual([[], []]);
|
|
61
|
+
});
|
|
62
|
+
}, 10e3);
|