@joktec/mysql 0.0.179 → 0.0.181

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.
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AACpF,OAAO,EAAE,eAAe,EAAwE,MAAM,SAAS,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,qBAAa,WAAW;IACtB,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IASjE,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,UAAU,EACzC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAC3D,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAc/B,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IA2D/E,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAQ5D,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;CAalF"}
1
+ {"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AACpF,OAAO,EAEL,eAAe,EAShB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAIvC,qBAAa,WAAW;IACtB,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IASjE,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,UAAU,EACzC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAC3D,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAc/B,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IA4D/E,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAQ5D,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;CAalF"}
@@ -4,6 +4,7 @@ exports.MysqlFinder = void 0;
4
4
  const core_1 = require("@joktec/core");
5
5
  const typeorm_1 = require("typeorm");
6
6
  const mysql_exception_1 = require("../mysql.exception");
7
+ const lodash_1 = require("lodash");
7
8
  class MysqlFinder {
8
9
  static parseFilter(query) {
9
10
  const { condition = {}, keyword } = query;
@@ -32,15 +33,11 @@ class MysqlFinder {
32
33
  where[key === '$and' ? 'AND' : 'OR'] = value.map((c) => MysqlFinder.parseCondition(c));
33
34
  continue;
34
35
  }
35
- if (value === null || value === undefined) {
36
- where[key] = (0, typeorm_1.Not)(null);
37
- continue;
38
- }
39
36
  if (typeof value === 'object') {
40
37
  for (const [op, val] of Object.entries(value)) {
41
38
  switch (op) {
42
39
  case '$eq':
43
- where[key] = val;
40
+ where[key] = (0, lodash_1.isNil)(value) ? (0, typeorm_1.IsNull)() : (0, typeorm_1.Equal)(val);
44
41
  break;
45
42
  case '$gt':
46
43
  where[key] = (0, typeorm_1.MoreThan)(val);
@@ -55,10 +52,15 @@ class MysqlFinder {
55
52
  where[key] = (0, typeorm_1.LessThanOrEqual)(val);
56
53
  break;
57
54
  case '$ne':
58
- where[key] = (0, typeorm_1.Not)(val);
55
+ where[key] = (0, lodash_1.isNil)(val) ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.Not)(val);
59
56
  break;
60
57
  case '$in':
61
- where[key] = (0, typeorm_1.In)((0, core_1.toArray)(val));
58
+ if ((0, core_1.toArray)(val).length)
59
+ where[key] = (0, typeorm_1.In)((0, core_1.toArray)(val));
60
+ break;
61
+ case '$nin':
62
+ if ((0, core_1.toArray)(val).length)
63
+ where[key] = (0, typeorm_1.Not)((0, typeorm_1.In)((0, core_1.toArray)(val)));
62
64
  break;
63
65
  case '$like':
64
66
  where[key] = (0, typeorm_1.ILike)(`%${val}%`);
@@ -69,6 +71,9 @@ class MysqlFinder {
69
71
  case '$end':
70
72
  where[key] = (0, typeorm_1.ILike)(`%${val}`);
71
73
  break;
74
+ case '$not':
75
+ where[key] = (0, typeorm_1.Not)(this.parseCondition(val));
76
+ break;
72
77
  default:
73
78
  throw new mysql_exception_1.MysqlException(`Operator ${op} not supported`, { op, val });
74
79
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.finder.js","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":";;;AAAA,uCAAoF;AACpF,qCAAgH;AAEhH,wDAAoD;AAEpD,MAAa,WAAW;IACtB,MAAM,CAAC,WAAW,CAAI,KAAsB;QAC1C,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAC1C,MAAM,KAAK,GAAgC,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACjF,IAAI,OAAO,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACzC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAA,eAAK,EAAC,IAAI,OAAO,GAAG,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,eAAe,CACpB,MAA4D;QAE5D,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE;gBAC/D,GAAG,CAAC,KAAK,CAAC,GAAG,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC;gBAC/B,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,OAAO,IAAA,cAAO,EAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC3D,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;YAClB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,MAAM,CAAC,cAAc,CAAI,SAAwB;QAC/C,MAAM,KAAK,GAAgC,EAAE,CAAC;QAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;gBACpC,KAAK,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAgB,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtG,SAAS;YACX,CAAC;YAED,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,aAAG,EAAC,IAAI,CAAC,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9C,QAAQ,EAAE,EAAE,CAAC;wBACX,KAAK,KAAK;4BACR,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;4BACjB,MAAM;wBACR,KAAK,KAAK;4BACR,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,kBAAQ,EAAC,GAAG,CAAC,CAAC;4BAC3B,MAAM;wBACR,KAAK,MAAM;4BACT,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,yBAAe,EAAC,GAAG,CAAC,CAAC;4BAClC,MAAM;wBACR,KAAK,KAAK;4BACR,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,kBAAQ,EAAC,GAAG,CAAC,CAAC;4BAC3B,MAAM;wBACR,KAAK,MAAM;4BACT,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,yBAAe,EAAC,GAAG,CAAC,CAAC;4BAClC,MAAM;wBACR,KAAK,KAAK;4BACR,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,aAAG,EAAC,GAAG,CAAC,CAAC;4BACtB,MAAM;wBACR,KAAK,KAAK;4BACR,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,YAAE,EAAC,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC,CAAC;4BAC9B,MAAM;wBACR,KAAK,OAAO;4BACV,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,eAAK,EAAC,IAAI,GAAG,GAAG,CAAC,CAAC;4BAC/B,MAAM;wBACR,KAAK,QAAQ;4BACX,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,eAAK,EAAC,GAAG,GAAG,GAAG,CAAC,CAAC;4BAC9B,MAAM;wBACR,KAAK,MAAM;4BACT,KAAK,CAAC,GAAG,CAAC,GAAG,IAAA,eAAK,EAAC,IAAI,GAAG,EAAE,CAAC,CAAC;4BAC9B,MAAM;wBACR;4BACE,MAAM,IAAI,gCAAc,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC1E,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACrB,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,UAAU,CAAI,IAAS;QAC5B,MAAM,KAAK,GAAgC,EAAE,CAAC;QAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;QAChD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,cAAc,CAAI,QAAsB;QAC7C,MAAM,SAAS,GAAoC,EAAE,CAAC;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;gBAClB,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;gBACvB,SAAS;YACX,CAAC;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,SAAS,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1GD,kCA0GC"}
1
+ {"version":3,"file":"mysql.finder.js","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { Client, Constructor, DeepPartial, IBaseRepository, KeyOf } from '@joktec/core';
2
- import { DataSource, Repository } from 'typeorm';
2
+ import { DataSource, EntityManager, Repository } from 'typeorm';
3
3
  import { UpsertOptions } from 'typeorm/repository/UpsertOptions';
4
4
  import { IMysqlOption, MysqlId, MysqlModel } from './models';
5
5
  import { MysqlConfig } from './mysql.config';
@@ -12,6 +12,7 @@ export interface MysqlModelRegistry {
12
12
  [conId: string]: Constructor<MysqlModel>[];
13
13
  }
14
14
  export interface MysqlClient extends Client<MysqlConfig, DataSource> {
15
+ getEntityManager(conId?: string): EntityManager;
15
16
  getRepository<T extends MysqlModel>(entityClass: Constructor<T>, conId?: string): Repository<T>;
16
17
  }
17
18
  export interface IMysqlRepository<T extends MysqlModel, ID extends MysqlId> extends IBaseRepository<T, ID> {
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.client.d.ts","sourceRoot":"","sources":["../src/mysql.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC;IAClE,aAAa,CAAC,CAAC,SAAS,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;CACjG;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,EAAE,SAAS,OAAO,CAAE,SAAQ,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC;IACxG,MAAM,CACJ,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EACpB,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EACvB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,GAC/D,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd,UAAU,CACR,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EACtB,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EACvB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,GAC/D,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;CACjB"}
1
+ {"version":3,"file":"mysql.client.d.ts","sourceRoot":"","sources":["../src/mysql.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAkB,eAAe,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACxG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC;IAClE,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAEhD,aAAa,CAAC,CAAC,SAAS,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;CACjG;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,EAAE,SAAS,OAAO,CAAE,SAAQ,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC;IACxG,MAAM,CACJ,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EACpB,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EACvB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,GAC/D,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd,UAAU,CACR,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EACtB,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EACvB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,GAC/D,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;CACjB"}
@@ -1,5 +1,5 @@
1
1
  import { ConfigService, Constructor, ICondition, KeyOf, LogService, OnApplicationBootstrap, OnModuleInit } from '@joktec/core';
2
- import { DeepPartial, FindManyOptions, Repository } from 'typeorm';
2
+ import { DeepPartial, EntityManager, FindManyOptions, Repository } from 'typeorm';
3
3
  import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
4
4
  import { UpsertOptions } from 'typeorm/repository/UpsertOptions';
5
5
  import { IMysqlOption, IMysqlRequest, IMysqlResponse, MysqlId, MysqlModel } from './models';
@@ -14,6 +14,7 @@ export declare abstract class MysqlRepo<T extends MysqlModel, ID extends MysqlId
14
14
  protected constructor(mysqlService: MysqlService, model: Constructor<T>, conId?: string);
15
15
  onModuleInit(): Promise<void>;
16
16
  onApplicationBootstrap(): void;
17
+ get entityManager(): EntityManager;
17
18
  get repository(): Repository<T>;
18
19
  protected transform(docs: any | any[]): T | T[];
19
20
  qb(query?: IMysqlRequest<T>, opts?: IMysqlOption<T>): SelectQueryBuilder<T>;
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
@@ -25,6 +25,9 @@ let MysqlRepo = class MysqlRepo {
25
25
  this.logService.setContext(this.constructor.name);
26
26
  }
27
27
  onApplicationBootstrap() { }
28
+ get entityManager() {
29
+ return this.mysqlService.getEntityManager(this.conId);
30
+ }
28
31
  get repository() {
29
32
  return this.mysqlService.getRepository(this.model, this.conId);
30
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.repo.js","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mysql.repo.js","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { AbstractClientService, Constructor } from '@joktec/core';
2
- import { DataSource, Repository } from 'typeorm';
2
+ import { DataSource, EntityManager, Repository } from 'typeorm';
3
3
  import { MysqlModel } from './models';
4
4
  import { MysqlClient, MysqlModelRegistry } from './mysql.client';
5
5
  import { MysqlConfig } from './mysql.config';
@@ -9,6 +9,7 @@ export declare class MysqlService extends AbstractClientService<MysqlConfig, Dat
9
9
  protected init(config: MysqlConfig): Promise<DataSource>;
10
10
  start(client: DataSource, conId?: string): Promise<void>;
11
11
  stop(client: DataSource, conId?: string): Promise<void>;
12
+ getEntityManager(conId?: string): EntityManager;
12
13
  getRepository<T extends MysqlModel>(entityClass: Constructor<T>, conId?: string): Repository<T>;
13
14
  }
14
15
  //# sourceMappingURL=mysql.service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.service.d.ts","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAA6C,MAAM,cAAc,CAAC;AAE7G,OAAO,EAAgB,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAsB,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,qBACa,YAAa,SAAQ,qBAAqB,CAAC,WAAW,EAAE,UAAU,CAAE,YAAW,WAAW;IAC7D,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,kBAAkB;cAKjE,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAoBxD,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAStE,aAAa,CAAC,CAAC,SAAS,UAAU,EACvC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAC3B,KAAK,GAAE,MAAuB,GAC7B,UAAU,CAAC,CAAC,CAAC;CAGjB"}
1
+ {"version":3,"file":"mysql.service.d.ts","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAA6C,MAAM,cAAc,CAAC;AAE7G,OAAO,EAAgB,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAsB,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,qBACa,YAAa,SAAQ,qBAAqB,CAAC,WAAW,EAAE,UAAU,CAAE,YAAW,WAAW;IAC7D,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,kBAAkB;cAKjE,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAoBxD,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,MAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAStE,gBAAgB,CAAC,KAAK,GAAE,MAAuB,GAAG,aAAa;IAI/D,aAAa,CAAC,CAAC,SAAS,UAAU,EACvC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAC3B,KAAK,GAAE,MAAuB,GAC7B,UAAU,CAAC,CAAC,CAAC;CAGjB"}
@@ -68,6 +68,9 @@ let MysqlService = class MysqlService extends core_1.AbstractClientService {
68
68
  this.logService.error(err, '`%s` Error when close connection to MySQL', conId);
69
69
  }
70
70
  }
71
+ getEntityManager(conId = core_1.DEFAULT_CON_ID) {
72
+ return this.getClient(conId).createEntityManager();
73
+ }
71
74
  getRepository(entityClass, conId = core_1.DEFAULT_CON_ID) {
72
75
  return this.getClient(conId).getRepository(entityClass);
73
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mysql.service.js","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mysql.service.js","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"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"}