@rsdk/db.knex 4.0.0-next.1 → 4.0.0-next.10

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 CHANGED
@@ -3,6 +3,47 @@
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.10](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.9...v4.0.0-next.10) (2023-11-29)
7
+
8
+ **Note:** Version bump only for package @rsdk/db.knex
9
+
10
+ ## [4.0.0-next.9](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.8...v4.0.0-next.9) (2023-11-29)
11
+
12
+ **Note:** Version bump only for package @rsdk/db.knex
13
+
14
+ ## [4.0.0-next.8](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.7...v4.0.0-next.8) (2023-11-29)
15
+
16
+ ### Features
17
+
18
+ * Kafka batch producer ([#150](https://github.com/R-Vision/rsdk/issues/150)) ([2faa2f4](https://github.com/R-Vision/rsdk/commit/2faa2f41ca0dbb6d8a92cbf0ab20cf5cefeaf4e9))
19
+
20
+ ## [4.0.0-next.7](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.6...v4.0.0-next.7) (2023-11-21)
21
+
22
+ **Note:** Version bump only for package @rsdk/db.knex
23
+
24
+ ## [4.0.0-next.6](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.5...v4.0.0-next.6) (2023-11-21)
25
+
26
+ **Note:** Version bump only for package @rsdk/db.knex
27
+
28
+ ## [4.0.0-next.5](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.4...v4.0.0-next.5) (2023-11-13)
29
+
30
+ **Note:** Version bump only for package @rsdk/db.knex
31
+
32
+ ## [4.0.0-next.4](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.3...v4.0.0-next.4) (2023-11-12)
33
+
34
+ **Note:** Version bump only for package @rsdk/db.knex
35
+
36
+ ## [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)
37
+
38
+ ### Bug Fixes
39
+
40
+ * all yarn peers dependency issues ([e0db9ef](https://github.com/R-Vision/rsdk/commit/e0db9ef1ab8a4df4e1f8ff6f6a9e3728f497549b))
41
+ * one HEALTH_CHECK_QUERY + log it with trace level ([c6765da](https://github.com/R-Vision/rsdk/commit/c6765daedfec2e74230cc99234609dc57e2f39c3))
42
+
43
+ ## [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)
44
+
45
+ **Note:** Version bump only for package @rsdk/db.knex
46
+
6
47
  ## [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
48
 
8
49
  **Note:** Version bump only for package @rsdk/db.knex
@@ -185,10 +185,6 @@ class KnexContext extends db_1.BaseContext {
185
185
  * Удаляем обработанные слои
186
186
  */
187
187
  const layers = this.layers.splice(this.nestDepth);
188
- console.log('removed:', { layers });
189
- // for (const layer of layers) {
190
- // await layer.trx?.destroy();
191
- // }
192
188
  /**
193
189
  * Релизнули(закрыли) ли мы соединение
194
190
  */
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,7 @@ exports.KnexModule = void 0;
11
11
  const common_1 = require("@nestjs/common");
12
12
  const inject_knex_decorator_1 = require("./inject-knex.decorator");
13
13
  const providers_1 = require("./providers");
14
- let KnexModule = exports.KnexModule = KnexModule_1 = class KnexModule {
14
+ let KnexModule = KnexModule_1 = class KnexModule {
15
15
  static forRoot(options) {
16
16
  const instanceProvider = {
17
17
  inject: [providers_1.KnexFactory],
@@ -26,6 +26,7 @@ let KnexModule = exports.KnexModule = KnexModule_1 = class KnexModule {
26
26
  };
27
27
  }
28
28
  };
29
+ exports.KnexModule = KnexModule;
29
30
  exports.KnexModule = KnexModule = KnexModule_1 = __decorate([
30
31
  (0, common_1.Module)({})
31
32
  ], KnexModule);
@@ -1 +1 @@
1
- {"version":3,"file":"knex.module.js","sourceRoot":"","sources":["../src/knex.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAwC;AAGxC,mEAA+D;AAC/D,2CAAyD;AAIlD,IAAM,UAAU,uCAAhB,MAAM,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,OAA0B;QACvC,MAAM,gBAAgB,GAAoB;YACxC,MAAM,EAAE,CAAC,uBAAW,CAAC;YACrB,OAAO,EAAE,4CAAoB;YAC7B,UAAU,EAAE,KAAK,EAAE,OAAoB,EAAiB,EAAE,CACxD,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACvC,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,SAAS,EAAE,CAAC,yBAAa,EAAE,uBAAW,EAAE,gBAAgB,CAAC;YACzD,OAAO,EAAE,CAAC,gBAAgB,CAAC;YAC3B,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC;CACF,CAAA;qBAhBY,UAAU;IADtB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,UAAU,CAgBtB"}
1
+ {"version":3,"file":"knex.module.js","sourceRoot":"","sources":["../src/knex.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAwC;AAGxC,mEAA+D;AAC/D,2CAAyD;AAIlD,IAAM,UAAU,kBAAhB,MAAM,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,OAA0B;QACvC,MAAM,gBAAgB,GAAoB;YACxC,MAAM,EAAE,CAAC,uBAAW,CAAC;YACrB,OAAO,EAAE,4CAAoB;YAC7B,UAAU,EAAE,KAAK,EAAE,OAAoB,EAAiB,EAAE,CACxD,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACvC,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,SAAS,EAAE,CAAC,yBAAa,EAAE,uBAAW,EAAE,gBAAgB,CAAC;YACzD,OAAO,EAAE,CAAC,gBAAgB,CAAC;YAC3B,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC;CACF,CAAA;AAhBY,gCAAU;qBAAV,UAAU;IADtB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,UAAU,CAgBtB"}
@@ -1,5 +1,9 @@
1
1
  import { ILogger } from '@rsdk/logging';
2
2
  import type { Knex } from 'knex';
3
+ /**
4
+ * TODO: Как здесь понять, что распечатываться будет HEALTH_CHECK_QUERY?
5
+ * Нужно потестить.
6
+ */
3
7
  export declare class KnexLoggerAdapter implements Knex.Logger {
4
8
  private readonly platformLogger;
5
9
  constructor(platformLogger: ILogger);
@@ -14,7 +14,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.KnexLoggerAdapter = void 0;
16
16
  const core_1 = require("@rsdk/core");
17
- let KnexLoggerAdapter = exports.KnexLoggerAdapter = class KnexLoggerAdapter {
17
+ /**
18
+ * TODO: Как здесь понять, что распечатываться будет HEALTH_CHECK_QUERY?
19
+ * Нужно потестить.
20
+ */
21
+ let KnexLoggerAdapter = class KnexLoggerAdapter {
18
22
  platformLogger;
19
23
  constructor(platformLogger) {
20
24
  this.platformLogger = platformLogger;
@@ -38,6 +42,7 @@ let KnexLoggerAdapter = exports.KnexLoggerAdapter = class KnexLoggerAdapter {
38
42
  this.platformLogger.warn(`deprecate: ${method}, use: ${alternative}`);
39
43
  }
40
44
  };
45
+ exports.KnexLoggerAdapter = KnexLoggerAdapter;
41
46
  exports.KnexLoggerAdapter = KnexLoggerAdapter = __decorate([
42
47
  __param(0, (0, core_1.InjectLogger)(KnexLoggerAdapter)),
43
48
  __metadata("design:paramtypes", [Object])
@@ -1 +1 @@
1
- {"version":3,"file":"knex-logger.adapter.js","sourceRoot":"","sources":["../../src/providers/knex-logger.adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAA0C;AAI1C,IAAa,iBAAiB,+BAA9B,MAAa,iBAAiB;IAEwB;IADpD,YACoD,cAAuB;QAAvB,mBAAc,GAAd,cAAc,CAAS;QAEzE,4GAA4G;QAC5G,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,OAAY;QACf,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAY;QAChB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAY;QAChB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,WAAmB;QAC3C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,MAAM,UAAU,WAAW,EAAE,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;4BA3BY,iBAAiB;IAEzB,WAAA,IAAA,mBAAY,EAAC,iBAAiB,CAAC,CAAA;;GAFvB,iBAAiB,CA2B7B"}
1
+ {"version":3,"file":"knex-logger.adapter.js","sourceRoot":"","sources":["../../src/providers/knex-logger.adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAA0C;AAI1C;;;GAGG;AAEH,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAEwB;IADpD,YACoD,cAAuB;QAAvB,mBAAc,GAAd,cAAc,CAAS;QAEzE,4GAA4G;QAC5G,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,OAAY;QACf,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAY;QAChB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAY;QAChB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,WAAmB;QAC3C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,MAAM,UAAU,WAAW,EAAE,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;AA3BY,8CAAiB;4BAAjB,iBAAiB;IAEzB,WAAA,IAAA,mBAAY,EAAC,iBAAiB,CAAC,CAAA;;GAFvB,iBAAiB,CA2B7B"}
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.KnexPluginConfig = void 0;
13
13
  const common_1 = require("@rsdk/common");
14
14
  const core_1 = require("@rsdk/core");
15
- let KnexPluginConfig = exports.KnexPluginConfig = class KnexPluginConfig extends core_1.Config {
15
+ let KnexPluginConfig = class KnexPluginConfig extends core_1.Config {
16
16
  url;
17
17
  schema;
18
18
  poolMin;
@@ -20,6 +20,7 @@ let KnexPluginConfig = exports.KnexPluginConfig = class KnexPluginConfig extends
20
20
  reconnectAttempts;
21
21
  reconnectInterval;
22
22
  };
23
+ exports.KnexPluginConfig = KnexPluginConfig;
23
24
  __decorate([
24
25
  (0, core_1.Property)('DB_URL', new core_1.UrlParser(), {
25
26
  description: 'database server url',
@@ -1 +1 @@
1
- {"version":3,"file":"knex.config.js","sourceRoot":"","sources":["../../src/providers/knex.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8C;AAC9C,qCAQoB;AAGb,IAAM,gBAAgB,8BAAtB,MAAM,gBAAiB,SAAQ,aAAM;IAI1C,GAAG,CAAO;IASV,MAAM,CAAU;IAShB,OAAO,CAAU;IASjB,OAAO,CAAU;IAMjB,iBAAiB,CAAU;IAM3B,iBAAiB,CAAY;CAC9B,CAAA;AAxCC;IAHC,IAAA,eAAQ,EAAC,QAAQ,EAAE,IAAI,gBAAS,EAAE,EAAE;QACnC,WAAW,EAAE,qBAAqB;KACnC,CAAC;8BACI,GAAG;6CAAC;AASV;IAPC,IAAA,eAAQ,EAAC,WAAW,EAAE,IAAI,mBAAY,EAAE,EAAE;QACzC,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;QACD,YAAY,EAAE,EAAE;KACjB,CAAC;;gDACc;AAShB;IAPC,IAAA,eAAQ,EAAC,aAAa,EAAE,IAAI,gBAAS,EAAE,EAAE;QACxC,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;iDACe;AASjB;IAPC,IAAA,eAAQ,EAAC,aAAa,EAAE,IAAI,gBAAS,EAAE,EAAE;QACxC,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;iDACe;AAMjB;IAJC,IAAA,eAAQ,EAAC,uBAAuB,EAAE,IAAI,gBAAS,EAAE,EAAE;QAClD,YAAY,EAAE,MAAM,CAAC,iBAAiB;QACtC,WAAW,EAAE,oCAAoC;KAClD,CAAC;;2DACyB;AAM3B;IAJC,IAAA,eAAQ,EAAC,uBAAuB,EAAE,IAAI,qBAAc,EAAE,EAAE;QACvD,YAAY,EAAE,IAAI,iBAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAClC,WAAW,EAAE,uBAAuB;KACrC,CAAC;8BACkB,iBAAQ;2DAAC;2BA3ClB,gBAAgB;IAD5B,IAAA,oBAAa,GAAE;GACH,gBAAgB,CA4C5B"}
1
+ {"version":3,"file":"knex.config.js","sourceRoot":"","sources":["../../src/providers/knex.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8C;AAC9C,qCAQoB;AAGb,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,aAAM;IAI1C,GAAG,CAAO;IASV,MAAM,CAAU;IAShB,OAAO,CAAU;IASjB,OAAO,CAAU;IAMjB,iBAAiB,CAAU;IAM3B,iBAAiB,CAAY;CAC9B,CAAA;AA5CY,4CAAgB;AAI3B;IAHC,IAAA,eAAQ,EAAC,QAAQ,EAAE,IAAI,gBAAS,EAAE,EAAE;QACnC,WAAW,EAAE,qBAAqB;KACnC,CAAC;8BACI,GAAG;6CAAC;AASV;IAPC,IAAA,eAAQ,EAAC,WAAW,EAAE,IAAI,mBAAY,EAAE,EAAE;QACzC,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;QACD,YAAY,EAAE,EAAE;KACjB,CAAC;;gDACc;AAShB;IAPC,IAAA,eAAQ,EAAC,aAAa,EAAE,IAAI,gBAAS,EAAE,EAAE;QACxC,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;iDACe;AASjB;IAPC,IAAA,eAAQ,EAAC,aAAa,EAAE,IAAI,gBAAS,EAAE,EAAE;QACxC,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;iDACe;AAMjB;IAJC,IAAA,eAAQ,EAAC,uBAAuB,EAAE,IAAI,gBAAS,EAAE,EAAE;QAClD,YAAY,EAAE,MAAM,CAAC,iBAAiB;QACtC,WAAW,EAAE,oCAAoC;KAClD,CAAC;;2DACyB;AAM3B;IAJC,IAAA,eAAQ,EAAC,uBAAuB,EAAE,IAAI,qBAAc,EAAE,EAAE;QACvD,YAAY,EAAE,IAAI,iBAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAClC,WAAW,EAAE,uBAAuB;KACrC,CAAC;8BACkB,iBAAQ;2DAAC;2BA3ClB,gBAAgB;IAD5B,IAAA,oBAAa,GAAE;GACH,gBAAgB,CA4C5B"}
@@ -20,7 +20,7 @@ const knex_1 = require("knex");
20
20
  const promises_1 = require("node:timers/promises");
21
21
  const knex_config_1 = require("./knex.config");
22
22
  const knex_logger_adapter_1 = require("./knex-logger.adapter");
23
- let KnexFactory = exports.KnexFactory = class KnexFactory {
23
+ let KnexFactory = class KnexFactory {
24
24
  static { KnexFactory_1 = this; }
25
25
  appName;
26
26
  logger;
@@ -87,10 +87,11 @@ let KnexFactory = exports.KnexFactory = class KnexFactory {
87
87
  }
88
88
  }
89
89
  };
90
+ exports.KnexFactory = KnexFactory;
90
91
  exports.KnexFactory = KnexFactory = KnexFactory_1 = __decorate([
91
92
  (0, common_1.Injectable)(),
92
93
  __param(0, (0, core_1.AppName)()),
93
- __param(1, (0, core_1.InjectLogger)(KnexFactory_1)),
94
+ __param(1, (0, core_1.InjectLogger)(KnexFactory)),
94
95
  __metadata("design:paramtypes", [String, Object, knex_config_1.KnexPluginConfig])
95
96
  ], KnexFactory);
96
97
  //# sourceMappingURL=knex.factory.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"knex.factory.js","sourceRoot":"","sources":["../../src/providers/knex.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2CAA4C;AAC5C,qCAAmD;AAGnD,+BAA4B;AAC5B,mDAAkD;AAElD,+CAAiD;AACjD,+DAA0D;AAGnD,IAAM,WAAW,yBAAjB,MAAM,WAAW;;IAIQ;IACgB;IAC3B;IALX,MAAM,CAAC,QAAQ,GAAgB,IAAI,CAAC;IAE5C,YAC8B,OAAe,EACC,MAAe,EAC1C,MAAwB;QAFb,YAAO,GAAP,OAAO,CAAQ;QACC,WAAM,GAAN,MAAM,CAAS;QAC1C,WAAM,GAAN,MAAM,CAAkB;IACxC,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,MAAc;QAChC,IAAI,aAAW,CAAC,QAAQ,EAAE;YACxB,OAAO,aAAW,CAAC,QAAQ,CAAC;SAC7B;QAED,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC;YACxB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,uCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;YACvC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;YACtC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI;gBACxB,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;aACjC,CAAC;YACF,IAAI,EAAE;gBACJ,8DAA8D;gBAC9D,WAAW,EAAE,KAAK,EAAE,UAAe,EAAE,IAAS,EAAE,EAAE;oBAChD,MAAM,OAAO,GAAG;wBACd,qBAAqB;wBACrB,yBAAyB,IAAI,CAAC,OAAO,SAAS;qBAC/C,CAAC;oBAEF,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3C,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACzB,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBACxB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aACzB;SACF,CAAC,CAAC;QAEH;;;;;;;;;;;WAWG;QAEH,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC9C,IAAI;gBACF,MAAM,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnC,MAAM;aACP;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,kBAAkB,EAAE,KAAc,CAAC,CAAC;gBACvE,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;aAC1D;SACF;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,IAAI,aAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,aAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;SACtC;IACH,CAAC;;sBArEU,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,cAAO,GAAE,CAAA;IACT,WAAA,IAAA,mBAAY,EAAC,aAAW,CAAC,CAAA;qDACD,8BAAgB;GANhC,WAAW,CAsEvB"}
1
+ {"version":3,"file":"knex.factory.js","sourceRoot":"","sources":["../../src/providers/knex.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2CAA4C;AAC5C,qCAAmD;AAGnD,+BAA4B;AAC5B,mDAAkD;AAElD,+CAAiD;AACjD,+DAA0D;AAGnD,IAAM,WAAW,GAAjB,MAAM,WAAW;;IAIQ;IACgB;IAC3B;IALX,MAAM,CAAC,QAAQ,GAAgB,IAAI,CAAC;IAE5C,YAC8B,OAAe,EACC,MAAe,EAC1C,MAAwB;QAFb,YAAO,GAAP,OAAO,CAAQ;QACC,WAAM,GAAN,MAAM,CAAS;QAC1C,WAAM,GAAN,MAAM,CAAkB;IACxC,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,MAAc;QAChC,IAAI,aAAW,CAAC,QAAQ,EAAE;YACxB,OAAO,aAAW,CAAC,QAAQ,CAAC;SAC7B;QAED,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC;YACxB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,uCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;YACvC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;YACtC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI;gBACxB,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;aACjC,CAAC;YACF,IAAI,EAAE;gBACJ,8DAA8D;gBAC9D,WAAW,EAAE,KAAK,EAAE,UAAe,EAAE,IAAS,EAAE,EAAE;oBAChD,MAAM,OAAO,GAAG;wBACd,qBAAqB;wBACrB,yBAAyB,IAAI,CAAC,OAAO,SAAS;qBAC/C,CAAC;oBAEF,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3C,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACzB,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBACxB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aACzB;SACF,CAAC,CAAC;QAEH;;;;;;;;;;;WAWG;QAEH,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC9C,IAAI;gBACF,MAAM,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnC,MAAM;aACP;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,kBAAkB,EAAE,KAAc,CAAC,CAAC;gBACvE,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;aAC1D;SACF;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,IAAI,aAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,aAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;SACtC;IACH,CAAC;;AArEU,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,cAAO,GAAE,CAAA;IACT,WAAA,IAAA,mBAAY,EAAC,WAAW,CAAC,CAAA;qDACD,8BAAgB;GANhC,WAAW,CAsEvB"}
@@ -14,24 +14,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.KnexIndicator = void 0;
16
16
  const common_1 = require("@nestjs/common");
17
+ const common_2 = require("@rsdk/common");
17
18
  const core_1 = require("@rsdk/core");
19
+ const db_1 = require("@rsdk/db");
18
20
  const knex_1 = require("knex");
19
21
  const inject_knex_decorator_1 = require("../inject-knex.decorator");
20
- let KnexIndicator = exports.KnexIndicator = class KnexIndicator {
22
+ let KnexIndicator = class KnexIndicator {
21
23
  knex;
22
24
  constructor(knex) {
23
25
  this.knex = knex;
24
26
  }
25
27
  async check() {
26
28
  try {
27
- await this.knex.raw('SELECT 1');
28
- return core_1.CheckResult.up({});
29
+ await this.knex.raw(db_1.HEALTH_CHECK_QUERY);
30
+ return core_1.CheckResult.up({ query: db_1.HEALTH_CHECK_QUERY });
29
31
  }
30
32
  catch (error) {
33
+ common_2.Assert.isError(error);
31
34
  return core_1.CheckResult.down({ error: error.message });
32
35
  }
33
36
  }
34
37
  };
38
+ exports.KnexIndicator = KnexIndicator;
35
39
  exports.KnexIndicator = KnexIndicator = __decorate([
36
40
  (0, common_1.Injectable)(),
37
41
  (0, core_1.Indicator)('knex'),
@@ -1 +1 @@
1
- {"version":3,"file":"knex.indicator.js","sourceRoot":"","sources":["../../src/providers/knex.indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,qCAAoD;AACpD,+BAA4B;AAE5B,oEAAsD;AAI/C,IAAM,aAAa,2BAAnB,MAAM,aAAa;IACmB;IAA3C,YAA2C,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAElD,KAAK,CAAC,KAAK;QAChB,IAAI;YACF,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEhC,OAAO,kBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SAC3B;QAAC,OAAO,KAAc,EAAE;YACvB,OAAO,kBAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;IACH,CAAC;CACF,CAAA;wBAZY,aAAa;IAFzB,IAAA,mBAAU,GAAE;IACZ,IAAA,gBAAS,EAAC,MAAM,CAAC;IAEH,WAAA,IAAA,kCAAU,GAAE,CAAA;;GADd,aAAa,CAYzB"}
1
+ {"version":3,"file":"knex.indicator.js","sourceRoot":"","sources":["../../src/providers/knex.indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yCAAsC;AAEtC,qCAAoD;AACpD,iCAA8C;AAC9C,+BAA4B;AAE5B,oEAAsD;AAI/C,IAAM,aAAa,GAAnB,MAAM,aAAa;IACmB;IAA3C,YAA2C,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAElD,KAAK,CAAC,KAAK;QAChB,IAAI;YACF,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,uBAAkB,CAAC,CAAC;YAExC,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,sCAAa;wBAAb,aAAa;IAFzB,IAAA,mBAAU,GAAE;IACZ,IAAA,gBAAS,EAAC,MAAM,CAAC;IAEH,WAAA,IAAA,kCAAU,GAAE,CAAA;;GADd,aAAa,CAazB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/db.knex",
3
- "version": "4.0.0-next.1",
3
+ "version": "4.0.0-next.10",
4
4
  "description": "Knex integration for platform",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -14,13 +14,15 @@
14
14
  "prepublishOnly": "npm run build"
15
15
  },
16
16
  "peerDependencies": {
17
- "@nestjs/common": "^10.1.3",
18
- "@nestjs/core": "^10.1.3",
19
- "@rsdk/common": "^3.5.0",
20
- "@rsdk/core": "^4.0.0-next.1",
21
- "@rsdk/db": "^4.0.0-next.1",
22
- "@rsdk/logging": "^4.0.0-next.1",
23
- "knex": "^2.4.2"
17
+ "@nestjs/common": "^10.0.0",
18
+ "@nestjs/core": "^10.0.0",
19
+ "@rsdk/common": "^4.0.0-next.10",
20
+ "@rsdk/core": "^4.0.0-next.10",
21
+ "@rsdk/db": "^4.0.0-next.10",
22
+ "@rsdk/logging": "^4.0.0-next.10",
23
+ "knex": "^2.4.2",
24
+ "reflect-metadata": "^0.1.13",
25
+ "rxjs": "^7.0.0"
24
26
  },
25
- "gitHead": "d21a800ef5dd191b5effec59846c3a44a7ca3d1e"
27
+ "gitHead": "c41d4da9aa0318d5e6417514c763618ce924f9b7"
26
28
  }
@@ -251,10 +251,6 @@ export class KnexContext extends BaseContext<IsolationLevel> {
251
251
  */
252
252
  const layers = this.layers.splice(this.nestDepth);
253
253
 
254
- console.log('removed:', { layers });
255
- // for (const layer of layers) {
256
- // await layer.trx?.destroy();
257
- // }
258
254
  /**
259
255
  * Релизнули(закрыли) ли мы соединение
260
256
  */
@@ -2,6 +2,11 @@ import { InjectLogger } from '@rsdk/core';
2
2
  import { ILogger } from '@rsdk/logging';
3
3
  import type { Knex } from 'knex';
4
4
 
5
+ /**
6
+ * TODO: Как здесь понять, что распечатываться будет HEALTH_CHECK_QUERY?
7
+ * Нужно потестить.
8
+ */
9
+
5
10
  export class KnexLoggerAdapter implements Knex.Logger {
6
11
  constructor(
7
12
  @InjectLogger(KnexLoggerAdapter) private readonly platformLogger: ILogger,
@@ -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 { Knex } from 'knex';
5
7
 
6
8
  import { InjectKnex } from '../inject-knex.decorator';
@@ -12,11 +14,12 @@ export class KnexIndicator implements HealthIndicator {
12
14
 
13
15
  public async check(): Promise<CheckResult> {
14
16
  try {
15
- await this.knex.raw('SELECT 1');
17
+ await this.knex.raw(HEALTH_CHECK_QUERY);
16
18
 
17
- return CheckResult.up({});
19
+ return CheckResult.up({ query: HEALTH_CHECK_QUERY });
18
20
  } catch (error: unknown) {
19
- return CheckResult.down({ error: (error as Error).message });
21
+ Assert.isError(error);
22
+ return CheckResult.down({ error: error.message });
20
23
  }
21
24
  }
22
25
  }