@joktec/mysql 0.0.176 → 0.0.178
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/dist/decorators/index.d.ts +2 -0
- package/dist/decorators/index.d.ts.map +1 -0
- package/dist/decorators/index.js +18 -0
- package/dist/decorators/index.js.map +1 -0
- package/dist/decorators/table.decorator.d.ts +20 -0
- package/dist/decorators/table.decorator.d.ts.map +1 -0
- package/dist/decorators/table.decorator.js +31 -0
- package/dist/decorators/table.decorator.js.map +1 -0
- package/dist/helpers/index.d.ts +2 -0
- package/dist/helpers/index.d.ts.map +1 -1
- package/dist/helpers/index.js +2 -0
- package/dist/helpers/index.js.map +1 -1
- package/dist/helpers/mysql.finder.d.ts +11 -0
- package/dist/helpers/mysql.finder.d.ts.map +1 -0
- package/dist/helpers/mysql.finder.js +105 -0
- package/dist/helpers/mysql.finder.js.map +1 -0
- package/dist/helpers/mysql.helper.d.ts +7 -8
- package/dist/helpers/mysql.helper.d.ts.map +1 -1
- package/dist/helpers/mysql.helper.js +68 -56
- package/dist/helpers/mysql.helper.js.map +1 -1
- package/dist/helpers/mysql.utils.d.ts +4 -0
- package/dist/helpers/mysql.utils.d.ts.map +1 -0
- package/dist/helpers/mysql.utils.js +25 -0
- package/dist/helpers/mysql.utils.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/mysql.benchmark.d.ts +15 -0
- package/dist/mysql.benchmark.d.ts.map +1 -0
- package/dist/mysql.benchmark.js +72 -0
- package/dist/mysql.benchmark.js.map +1 -0
- package/dist/mysql.config.d.ts +16 -1
- package/dist/mysql.config.d.ts.map +1 -1
- package/dist/mysql.config.js +44 -7
- package/dist/mysql.config.js.map +1 -1
- package/dist/mysql.exception.d.ts +1 -1
- package/dist/mysql.exception.d.ts.map +1 -1
- package/dist/mysql.exception.js.map +1 -1
- package/dist/mysql.repo.d.ts +3 -1
- package/dist/mysql.repo.d.ts.map +1 -1
- package/dist/mysql.repo.js +38 -7
- package/dist/mysql.repo.js.map +1 -1
- package/dist/mysql.service.d.ts.map +1 -1
- package/dist/mysql.service.js +4 -2
- package/dist/mysql.service.js.map +1 -1
- package/dist/mysql.strategy.d.ts +15 -0
- package/dist/mysql.strategy.d.ts.map +1 -0
- package/dist/mysql.strategy.js +49 -0
- package/dist/mysql.strategy.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -4
|
@@ -0,0 +1,72 @@
|
|
|
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
|
+
};
|
|
11
|
+
var MysqlBenchmark_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.MysqlBenchmark = void 0;
|
|
14
|
+
const core_1 = require("@joktec/core");
|
|
15
|
+
const helpers_1 = require("./helpers");
|
|
16
|
+
const mysql_config_1 = require("./mysql.config");
|
|
17
|
+
const mysql_exception_1 = require("./mysql.exception");
|
|
18
|
+
let MysqlBenchmark = MysqlBenchmark_1 = class MysqlBenchmark {
|
|
19
|
+
constructor(benchmark, logService) {
|
|
20
|
+
this.benchmark = benchmark;
|
|
21
|
+
this.logService = logService;
|
|
22
|
+
this.logService.setContext(MysqlBenchmark_1.name);
|
|
23
|
+
}
|
|
24
|
+
logQuery(query, parameters) {
|
|
25
|
+
if (this.benchmark.enable && (this.benchmark.all || this.benchmark.level?.includes(mysql_config_1.MysqlLogLevel.query))) {
|
|
26
|
+
const sql = (0, helpers_1.printSql)(query, parameters);
|
|
27
|
+
this.logService.info('[SQL]: %s', sql);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
logQueryError(error, query, parameters) {
|
|
31
|
+
if (this.benchmark.enable && (this.benchmark.all || this.benchmark.level?.includes(mysql_config_1.MysqlLogLevel.error))) {
|
|
32
|
+
const _error = error instanceof Error ? error : new mysql_exception_1.MysqlException(error);
|
|
33
|
+
const sql = (0, helpers_1.printSql)(query, parameters);
|
|
34
|
+
this.logService.error(_error, `[FAILED QUERY]: %s`, sql);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
logQuerySlow(time, query, parameters) {
|
|
38
|
+
const sql = (0, helpers_1.printSql)(query, parameters);
|
|
39
|
+
this.logService.warn('[SLOW QUERY: %s ms]: %s', time, sql);
|
|
40
|
+
}
|
|
41
|
+
logSchemaBuild(message) {
|
|
42
|
+
if (this.benchmark.all && this.benchmark.level?.includes(mysql_config_1.MysqlLogLevel.schema)) {
|
|
43
|
+
this.logService.trace(message);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
logMigration(message) {
|
|
47
|
+
this.logService.trace(message);
|
|
48
|
+
}
|
|
49
|
+
log(level, message) {
|
|
50
|
+
switch (level) {
|
|
51
|
+
case 'log':
|
|
52
|
+
if (this.benchmark.all && this.benchmark.level?.includes(mysql_config_1.MysqlLogLevel.log))
|
|
53
|
+
this.logService.debug('[LOG]: %s', message);
|
|
54
|
+
break;
|
|
55
|
+
case 'info':
|
|
56
|
+
if (this.benchmark.all && this.benchmark.level?.includes(mysql_config_1.MysqlLogLevel.info))
|
|
57
|
+
this.logService.info('[INFO]: %s', message);
|
|
58
|
+
break;
|
|
59
|
+
case 'warn':
|
|
60
|
+
if (this.benchmark.all && this.benchmark.level?.includes(mysql_config_1.MysqlLogLevel.warn))
|
|
61
|
+
this.logService.warn('[WARN]: %s', message);
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
exports.MysqlBenchmark = MysqlBenchmark;
|
|
67
|
+
exports.MysqlBenchmark = MysqlBenchmark = MysqlBenchmark_1 = __decorate([
|
|
68
|
+
(0, core_1.Injectable)(),
|
|
69
|
+
__metadata("design:paramtypes", [mysql_config_1.MysqlBenchmarkConfig,
|
|
70
|
+
core_1.LogService])
|
|
71
|
+
], MysqlBenchmark);
|
|
72
|
+
//# sourceMappingURL=mysql.benchmark.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mysql.benchmark.js","sourceRoot":"","sources":["../src/mysql.benchmark.ts"],"names":[],"mappings":"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"}
|
package/dist/mysql.config.d.ts
CHANGED
|
@@ -28,6 +28,21 @@ export declare enum Dialect {
|
|
|
28
28
|
CAPACITOR = "capacitor",
|
|
29
29
|
SPANNER = "spanner"
|
|
30
30
|
}
|
|
31
|
+
export declare enum MysqlLogLevel {
|
|
32
|
+
query = "query",
|
|
33
|
+
schema = "schema",
|
|
34
|
+
error = "error",
|
|
35
|
+
warn = "warn",
|
|
36
|
+
info = "info",
|
|
37
|
+
log = "log",
|
|
38
|
+
migration = "migration"
|
|
39
|
+
}
|
|
40
|
+
export declare class MysqlBenchmarkConfig {
|
|
41
|
+
enable?: boolean;
|
|
42
|
+
all?: boolean;
|
|
43
|
+
level?: MysqlLogLevel[];
|
|
44
|
+
constructor(props?: Partial<MysqlBenchmarkConfig>);
|
|
45
|
+
}
|
|
31
46
|
export declare class MysqlConfig extends ClientConfig {
|
|
32
47
|
dialect?: Dialect;
|
|
33
48
|
host?: string;
|
|
@@ -39,8 +54,8 @@ export declare class MysqlConfig extends ClientConfig {
|
|
|
39
54
|
timezone?: string;
|
|
40
55
|
connectTimeout?: number;
|
|
41
56
|
slaves?: MysqlSlaveConfig[];
|
|
42
|
-
benchmark?: boolean;
|
|
43
57
|
sync?: boolean;
|
|
58
|
+
benchmark?: MysqlBenchmarkConfig;
|
|
44
59
|
constructor(props: MysqlConfig);
|
|
45
60
|
}
|
|
46
61
|
//# sourceMappingURL=mysql.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,cAAc,CAAC;AAGtB,qBAAa,gBAAgB;IAG3B,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,gBAAgB;CAGpC;AAED,oBAAY,OAAO;IACjB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,IAAI,SAAS;IACb,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,OAAO,YAAY;CACpB;AAED,qBAAa,WAAY,SAAQ,YAAY;IAG3C,OAAO,CAAC,EAAE,OAAO,CAAiB;IAIlC,IAAI,CAAC,EAAE,MAAM,CAAe;IAI5B,IAAI,CAAC,EAAE,MAAM,CAAQ;IAIrB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAS;IAKhC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAM;IAIjC,
|
|
1
|
+
{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,cAAc,CAAC;AAGtB,qBAAa,gBAAgB;IAG3B,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,gBAAgB;CAGpC;AAED,oBAAY,OAAO;IACjB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,IAAI,SAAS;IACb,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,OAAO,YAAY;CACpB;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,SAAS,cAAc;CACxB;AAED,qBAAa,oBAAoB;IAG/B,MAAM,CAAC,EAAE,OAAO,CAAS;IAIzB,GAAG,CAAC,EAAE,OAAO,CAAS;IAKtB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAM;gBAEjB,KAAK,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;CAGlD;AAED,qBAAa,WAAY,SAAQ,YAAY;IAG3C,OAAO,CAAC,EAAE,OAAO,CAAiB;IAIlC,IAAI,CAAC,EAAE,MAAM,CAAe;IAI5B,IAAI,CAAC,EAAE,MAAM,CAAQ;IAIrB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAS;IAKhC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAM;IAIjC,IAAI,CAAC,EAAE,OAAO,CAAQ;IAItB,SAAS,CAAC,EAAE,oBAAoB,CAAC;gBAErB,KAAK,EAAE,WAAW;CAW/B"}
|
package/dist/mysql.config.js
CHANGED
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.MysqlConfig = exports.Dialect = exports.MysqlSlaveConfig = void 0;
|
|
12
|
+
exports.MysqlConfig = exports.MysqlBenchmarkConfig = exports.MysqlLogLevel = exports.Dialect = exports.MysqlSlaveConfig = void 0;
|
|
13
13
|
const core_1 = require("@joktec/core");
|
|
14
14
|
const lodash_1 = require("lodash");
|
|
15
15
|
class MysqlSlaveConfig {
|
|
@@ -65,6 +65,41 @@ var Dialect;
|
|
|
65
65
|
Dialect["CAPACITOR"] = "capacitor";
|
|
66
66
|
Dialect["SPANNER"] = "spanner";
|
|
67
67
|
})(Dialect || (exports.Dialect = Dialect = {}));
|
|
68
|
+
var MysqlLogLevel;
|
|
69
|
+
(function (MysqlLogLevel) {
|
|
70
|
+
MysqlLogLevel["query"] = "query";
|
|
71
|
+
MysqlLogLevel["schema"] = "schema";
|
|
72
|
+
MysqlLogLevel["error"] = "error";
|
|
73
|
+
MysqlLogLevel["warn"] = "warn";
|
|
74
|
+
MysqlLogLevel["info"] = "info";
|
|
75
|
+
MysqlLogLevel["log"] = "log";
|
|
76
|
+
MysqlLogLevel["migration"] = "migration";
|
|
77
|
+
})(MysqlLogLevel || (exports.MysqlLogLevel = MysqlLogLevel = {}));
|
|
78
|
+
class MysqlBenchmarkConfig {
|
|
79
|
+
constructor(props) {
|
|
80
|
+
this.enable = false;
|
|
81
|
+
this.all = false;
|
|
82
|
+
this.level = [];
|
|
83
|
+
Object.assign(this, props);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.MysqlBenchmarkConfig = MysqlBenchmarkConfig;
|
|
87
|
+
__decorate([
|
|
88
|
+
(0, core_1.IsOptional)(),
|
|
89
|
+
(0, core_1.IsBoolean)(),
|
|
90
|
+
__metadata("design:type", Boolean)
|
|
91
|
+
], MysqlBenchmarkConfig.prototype, "enable", void 0);
|
|
92
|
+
__decorate([
|
|
93
|
+
(0, core_1.IsOptional)(),
|
|
94
|
+
(0, core_1.IsBoolean)(),
|
|
95
|
+
__metadata("design:type", Boolean)
|
|
96
|
+
], MysqlBenchmarkConfig.prototype, "all", void 0);
|
|
97
|
+
__decorate([
|
|
98
|
+
(0, core_1.IsOptional)(),
|
|
99
|
+
(0, core_1.IsArray)(),
|
|
100
|
+
(0, core_1.IsEnum)(MysqlLogLevel, { each: true }),
|
|
101
|
+
__metadata("design:type", Array)
|
|
102
|
+
], MysqlBenchmarkConfig.prototype, "level", void 0);
|
|
68
103
|
class MysqlConfig extends core_1.ClientConfig {
|
|
69
104
|
constructor(props) {
|
|
70
105
|
super(props);
|
|
@@ -73,9 +108,11 @@ class MysqlConfig extends core_1.ClientConfig {
|
|
|
73
108
|
this.port = 3306;
|
|
74
109
|
this.connectTimeout = 20000;
|
|
75
110
|
this.slaves = [];
|
|
76
|
-
this.benchmark = false;
|
|
77
111
|
this.sync = true;
|
|
78
|
-
Object.assign(this,
|
|
112
|
+
Object.assign(this, {
|
|
113
|
+
...props,
|
|
114
|
+
benchmark: new MysqlBenchmarkConfig(props?.benchmark),
|
|
115
|
+
});
|
|
79
116
|
if (props?.slaves?.length) {
|
|
80
117
|
const masterConfig = (0, lodash_1.pick)(props, ['host', 'port', 'username', 'password', 'database']);
|
|
81
118
|
this.slaves = props.slaves.map(slave => new MysqlSlaveConfig({ ...masterConfig, ...slave }));
|
|
@@ -138,10 +175,10 @@ __decorate([
|
|
|
138
175
|
(0, core_1.IsOptional)(),
|
|
139
176
|
(0, core_1.IsBoolean)(),
|
|
140
177
|
__metadata("design:type", Boolean)
|
|
141
|
-
], MysqlConfig.prototype, "
|
|
178
|
+
], MysqlConfig.prototype, "sync", void 0);
|
|
142
179
|
__decorate([
|
|
143
180
|
(0, core_1.IsOptional)(),
|
|
144
|
-
(0, core_1.
|
|
145
|
-
__metadata("design:type",
|
|
146
|
-
], MysqlConfig.prototype, "
|
|
181
|
+
(0, core_1.IsTypes)(MysqlBenchmarkConfig),
|
|
182
|
+
__metadata("design:type", MysqlBenchmarkConfig)
|
|
183
|
+
], MysqlConfig.prototype, "benchmark", void 0);
|
|
147
184
|
//# sourceMappingURL=mysql.config.js.map
|
package/dist/mysql.config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAUsB;AACtB,mCAA8B;AAE9B,MAAa,gBAAgB;IAqB3B,YAAY,KAAuB;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;IACpC,CAAC;CACF;AAxBD,4CAwBC;AArBC;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;8CACA;AAIb;IAFC,IAAA,YAAK,GAAE;IACP,IAAA,iBAAU,GAAE;;8CACA;AAIb;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;kDACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;kDACI;AAIjB;IAFC,IAAA,eAAQ,GAAE;IACV,IAAA,iBAAU,GAAE;;kDACI;AAOnB,IAAY,OAoBX;AApBD,WAAY,OAAO;IACjB,0BAAe,CAAA;IACf,gCAAqB,CAAA;IACrB,sCAA2B,CAAA;IAC3B,sBAAW,CAAA;IACX,8BAAmB,CAAA;IACnB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,wCAA6B,CAAA;IAC7B,wCAA6B,CAAA;IAC7B,0BAAe,CAAA;IACf,4BAAiB,CAAA;IACjB,0BAAe,CAAA;IACf,8BAAmB,CAAA;IACnB,wCAA6B,CAAA;IAC7B,8CAAmC,CAAA;IACnC,wBAAa,CAAA;IACb,4CAAiC,CAAA;IACjC,kCAAuB,CAAA;IACvB,8BAAmB,CAAA;AACrB,CAAC,EApBW,OAAO,uBAAP,OAAO,QAoBlB;AAED,MAAa,WAAY,SAAQ,mBAAY;IAkD3C,YAAY,KAAkB;QAC5B,KAAK,CAAC,KAAK,CAAC,CAAC;QAhDf,YAAO,GAAa,OAAO,CAAC,KAAK,CAAC;QAIlC,SAAI,GAAY,WAAW,CAAC;QAI5B,SAAI,GAAY,IAAI,CAAC;QAwBrB,mBAAc,GAAY,KAAK,CAAC;QAKhC,WAAM,GAAwB,EAAE,CAAC;QAIjC,
|
|
1
|
+
{"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { InternalServerException } from '@joktec/core';
|
|
2
2
|
export declare class MysqlException extends InternalServerException {
|
|
3
|
-
constructor(msg
|
|
3
|
+
constructor(msg?: string, error?: any);
|
|
4
4
|
}
|
|
5
5
|
export declare const MysqlCatch: MethodDecorator;
|
|
6
6
|
//# sourceMappingURL=mysql.exception.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.exception.d.ts","sourceRoot":"","sources":["../src/mysql.exception.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAInG,qBAAa,cAAe,SAAQ,uBAAuB;gBAC7C,GAAG,
|
|
1
|
+
{"version":3,"file":"mysql.exception.d.ts","sourceRoot":"","sources":["../src/mysql.exception.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAInG,qBAAa,cAAe,SAAQ,uBAAuB;gBAC7C,GAAG,GAAE,MAA0B,EAAE,KAAK,CAAC,EAAE,GAAG;CAGzD;AAED,eAAO,MAAM,UAAU,iBAWrB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.exception.js","sourceRoot":"","sources":["../src/mysql.exception.ts"],"names":[],"mappings":";;;AAAA,uCAAmG;AACnG,mCAAmC;AACnC,qCAA2C;AAE3C,MAAa,cAAe,SAAQ,8BAAuB;IACzD,YAAY,MAAc,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"mysql.exception.js","sourceRoot":"","sources":["../src/mysql.exception.ts"],"names":[],"mappings":";;;AAAA,uCAAmG;AACnG,mCAAmC;AACnC,qCAA2C;AAE3C,MAAa,cAAe,SAAQ,8BAAuB;IACzD,YAAY,MAAc,iBAAiB,EAAE,KAAW;QACtD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACpB,CAAC;CACF;AAJD,wCAIC;AAEY,QAAA,UAAU,GAAG,IAAA,0BAAmB,EAAC,KAAK,EAAE,OAA8B,EAAgB,EAAE;IACnG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACjC,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,0BAAgB,EAAE,CAAC;YACpC,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;YACjD,MAAM,IAAI,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,IAAI,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC,CAAC,CAAC"}
|
package/dist/mysql.repo.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ConfigService, Constructor, ICondition, KeyOf, LogService, OnApplicationBootstrap, OnModuleInit } from '@joktec/core';
|
|
2
2
|
import { DeepPartial, FindManyOptions, Repository } from 'typeorm';
|
|
3
|
+
import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
|
|
3
4
|
import { UpsertOptions } from 'typeorm/repository/UpsertOptions';
|
|
4
5
|
import { IMysqlOption, IMysqlRequest, IMysqlResponse, MysqlId, MysqlModel } from './models';
|
|
5
6
|
import { IMysqlRepository } from './mysql.client';
|
|
@@ -15,7 +16,8 @@ export declare abstract class MysqlRepo<T extends MysqlModel, ID extends MysqlId
|
|
|
15
16
|
onApplicationBootstrap(): void;
|
|
16
17
|
get repository(): Repository<T>;
|
|
17
18
|
protected transform(docs: any | any[]): T | T[];
|
|
18
|
-
qb(query?: IMysqlRequest<T>, opts?: IMysqlOption<T>):
|
|
19
|
+
qb(query?: IMysqlRequest<T>, opts?: IMysqlOption<T>): SelectQueryBuilder<T>;
|
|
20
|
+
finder(query?: IMysqlRequest<T>, opts?: IMysqlOption<T>): FindManyOptions<T>;
|
|
19
21
|
private whereById;
|
|
20
22
|
paginate(query: IMysqlRequest<T>, opts?: IMysqlOption<T>): Promise<IMysqlResponse<T>>;
|
|
21
23
|
find(query: IMysqlRequest<T>, opts?: IMysqlOption<T>): Promise<T[]>;
|
package/dist/mysql.repo.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,WAAW,EAEX,UAAU,EAGV,KAAK,EACL,UAAU,EACV,sBAAsB,EACtB,YAAY,EAGb,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAkB,UAAU,EAAE,MAAM,SAAS,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,8BACsB,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,EAAE,SAAS,OAAO,GAAG,OAAO,CAChF,YAAW,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,YAAY,EAAE,sBAAsB;IAMtE,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/B,SAAS,CAAC,KAAK,EAAE,MAAM;IANf,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAE3C,SAAS,aACG,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EACrB,KAAK,GAAE,MAAuB;IAGpC,YAAY;IAIlB,sBAAsB;IAEtB,IAAI,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,CAE9B;IAED,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;IAOxC,EAAE,CAAC,KAAK,GAAE,aAAa,CAAC,CAAC,CAAM,EAAE,IAAI,GAAE,YAAY,CAAC,CAAC,CAAM,GAAG,eAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mysql.repo.d.ts","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":"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"}
|
package/dist/mysql.repo.js
CHANGED
|
@@ -37,11 +37,42 @@ let MysqlRepo = class MysqlRepo {
|
|
|
37
37
|
return ((0, lodash_1.isArray)(docs) ? transformDocs : transformDocs[0]);
|
|
38
38
|
}
|
|
39
39
|
qb(query = {}, opts = {}) {
|
|
40
|
-
const
|
|
40
|
+
const metadata = Reflect.getMetadata('searchableKeywords', this.model);
|
|
41
|
+
const qb = this.repository.createQueryBuilder(this.model.name);
|
|
42
|
+
if (query.condition)
|
|
43
|
+
helpers_1.MysqlHelper.applyCondition(qb, query.condition);
|
|
41
44
|
if (query.select)
|
|
42
|
-
|
|
45
|
+
helpers_1.MysqlHelper.applyProjection(qb, query.select);
|
|
43
46
|
if (query.sort)
|
|
44
|
-
|
|
47
|
+
helpers_1.MysqlHelper.applyOrder(qb, query.sort);
|
|
48
|
+
if (query.limit)
|
|
49
|
+
qb.take(query.limit);
|
|
50
|
+
if (query.limit && query.page) {
|
|
51
|
+
qb.take(query.limit);
|
|
52
|
+
qb.skip((query.page - 1) * query.limit);
|
|
53
|
+
}
|
|
54
|
+
if (query.populate)
|
|
55
|
+
helpers_1.MysqlHelper.applyRelations(qb, query.populate);
|
|
56
|
+
if (opts.withDeleted)
|
|
57
|
+
qb.withDeleted();
|
|
58
|
+
if (opts.comment)
|
|
59
|
+
qb.comment(opts.comment);
|
|
60
|
+
if (opts.cache)
|
|
61
|
+
qb.cache(opts.cache);
|
|
62
|
+
if (opts.lock) {
|
|
63
|
+
if (opts.lock.mode === 'optimistic')
|
|
64
|
+
qb.setLock('optimistic', opts.lock.version);
|
|
65
|
+
else
|
|
66
|
+
qb.setLock(opts.lock.mode, undefined, opts.lock.tables).setOnLocked(opts.lock.onLocked);
|
|
67
|
+
}
|
|
68
|
+
return qb;
|
|
69
|
+
}
|
|
70
|
+
finder(query = {}, opts = {}) {
|
|
71
|
+
const options = helpers_1.MysqlFinder.parseFilter(query);
|
|
72
|
+
if (query.select)
|
|
73
|
+
options.select = helpers_1.MysqlFinder.parseProjection(query.select);
|
|
74
|
+
if (query.sort)
|
|
75
|
+
options.order = helpers_1.MysqlFinder.parseOrder(query.sort);
|
|
45
76
|
if (query.limit)
|
|
46
77
|
options.take = query.limit;
|
|
47
78
|
if (query.limit && query.page) {
|
|
@@ -49,7 +80,7 @@ let MysqlRepo = class MysqlRepo {
|
|
|
49
80
|
options.skip = (query.page - 1) * query.limit;
|
|
50
81
|
}
|
|
51
82
|
if (query.populate)
|
|
52
|
-
options.relations = helpers_1.
|
|
83
|
+
options.relations = helpers_1.MysqlFinder.parseRelations(query.populate);
|
|
53
84
|
return { ...opts, ...options };
|
|
54
85
|
}
|
|
55
86
|
whereById(pkValue) {
|
|
@@ -66,12 +97,12 @@ let MysqlRepo = class MysqlRepo {
|
|
|
66
97
|
return { items, total };
|
|
67
98
|
}
|
|
68
99
|
async find(query, opts = {}) {
|
|
69
|
-
const options = this.
|
|
100
|
+
const options = this.finder(query, opts);
|
|
70
101
|
const docs = await this.repository.find(options);
|
|
71
102
|
return this.transform(docs);
|
|
72
103
|
}
|
|
73
104
|
async count(query, opts = {}) {
|
|
74
|
-
const options = this.
|
|
105
|
+
const options = this.finder(query, opts);
|
|
75
106
|
return this.repository.count(options);
|
|
76
107
|
}
|
|
77
108
|
async findOne(cond, query = {}, opts = {}) {
|
|
@@ -81,7 +112,7 @@ let MysqlRepo = class MysqlRepo {
|
|
|
81
112
|
else
|
|
82
113
|
Object.assign(condition, cond);
|
|
83
114
|
const mergeQuery = Object.assign({}, query, { condition });
|
|
84
|
-
const options = this.
|
|
115
|
+
const options = this.finder(mergeQuery, opts);
|
|
85
116
|
const doc = await this.repository.findOne(options);
|
|
86
117
|
return this.transform(doc);
|
|
87
118
|
}
|
package/dist/mysql.repo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.repo.js","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAasB;AACtB,mCAAwD;
|
|
1
|
+
{"version":3,"file":"mysql.repo.js","sourceRoot":"","sources":["../src/mysql.repo.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAasB;AACtB,mCAAwD;AAIxD,uCAAqD;AAGrD,uDAA+C;AAC/C,mDAA+C;AAGxC,IAAe,SAAS,GAAxB,MAAe,SAAS;IAM7B,YACY,YAA0B,EAC1B,KAAqB,EACrB,QAAgB,qBAAc;QAF9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,UAAK,GAAL,KAAK,CAAgB;QACrB,UAAK,GAAL,KAAK,CAAyB;IACvC,CAAC;IAEJ,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,sBAAsB,KAAI,CAAC;IAE3B,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAES,SAAS,CAAC,IAAiB;QACnC,IAAI,IAAA,cAAK,EAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC7B,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAC7C,MAAM,aAAa,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,KAAK,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAQ,CAAC;IACnE,CAAC;IAEM,EAAE,CAAC,QAA0B,EAAE,EAAE,OAAwB,EAAE;QAChE,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEvE,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,KAAK,CAAC,SAAS;YAAE,qBAAW,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,KAAK,CAAC,MAAM;YAAE,qBAAW,CAAC,eAAe,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,KAAK,CAAC,IAAI;YAAE,qBAAW,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,KAAK;YAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ;YAAE,qBAAW,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,IAAI,CAAC,WAAW;YAAE,EAAE,CAAC,WAAW,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,OAAO;YAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,KAAK;YAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY;gBAAE,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;;gBAC5E,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/F,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,MAAM,CAAC,QAA0B,EAAE,EAAE,OAAwB,EAAE;QACpE,MAAM,OAAO,GAAuB,qBAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAGnE,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,CAAC,MAAM,GAAG,qBAAW,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7E,IAAI,KAAK,CAAC,IAAI;YAAE,OAAO,CAAC,KAAK,GAAG,qBAAW,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,KAAK,CAAC,KAAK;YAAE,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;QAC5C,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;YAC3B,OAAO,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QAChD,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ;YAAE,OAAO,CAAC,SAAS,GAAG,qBAAW,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEnF,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IACjC,CAAC;IAEO,SAAS,CAAC,OAAW;QAC3B,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAC1F,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACzC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAC,KAAuB,EAAE,OAAwB,EAAE;QAChE,MAAM,SAAS,GAAqB,EAAE,GAAG,KAAK,EAAE,CAAC;QACjD,MAAM,UAAU,GAAqB,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAChG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACrG,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CAAC,KAAuB,EAAE,OAAwB,EAAE;QAC5D,MAAM,OAAO,GAAuB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAQ,CAAC;IACrC,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAC,KAAuB,EAAE,OAAwB,EAAE;QAC7D,MAAM,OAAO,GAAuB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACX,IAAwB,EACxB,QAA6C,EAAE,EAC/C,OAAwB,EAAE;QAE1B,MAAM,SAAS,GAAkB,EAAE,CAAC;QACpC,IAAI,CAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC;YAAE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YACtE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAEpC,MAAM,UAAU,GAAqB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAsB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAM,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,IAAoB,EAAE,OAAwB,EAAE;QAC3D,MAAM,aAAa,GAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAM,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,IAAwB,EAAE,IAAoB,EAAE,UAA2B,EAAE;QACxF,MAAM,SAAS,GAAkB,EAAE,CAAC;QACpC,IAAI,CAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC;YAAE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YACtE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAEpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,aAAa,GAAM,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,CAAM,CAAC;QACrE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAM,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,IAAwB,EAAE,OAA8C,EAAE;QACrF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,MAAM,IAAI,GAAa,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QACzF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAM,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAC,IAAwB,EAAE,OAA6C,EAAE;QACrF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAM,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACV,IAAoB,EACpB,WAAuB,EACvB,OAAkE,EAAE;QAEpE,MAAM,aAAa,GAAQ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;QACpG,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAM,CAAC;IACtD,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CACd,IAAsB,EACtB,WAAuB,EACvB,OAAkE,EAAE;QAEpE,MAAM,aAAa,GAAQ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;QACpG,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAQ,CAAC;IACrD,CAAC;CACF,CAAA;AA5KqB,8BAAS;AAGT;IAAnB,IAAA,aAAM,GAAE;8BAA0B,oBAAa;gDAAC;AAC7B;IAAnB,IAAA,aAAM,GAAE;8BAAuB,iBAAU;6CAAC;AAyErC;IADL,4BAAU;;;;yCAMV;AAGK;IADL,4BAAU;;;;qCAKV;AAGK;IADL,4BAAU;;;;sCAIV;AAGK;IADL,4BAAU;;;;wCAcV;AAGK;IADL,4BAAU;;;;uCAKV;AAGK;IADL,4BAAU;;;;uCAYV;AAGK;IADL,4BAAU;;;;uCAOV;AAGK;IADL,4BAAU;;;;wCAMV;AAGK;IADL,4BAAU;;;;uCASV;AAGK;IADL,4BAAU;;;;2CASV;oBA3KmB,SAAS;IAD9B,IAAA,iBAAU,GAAE;qCAQe,4BAAY;GAPlB,SAAS,CA4K9B"}
|
|
@@ -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;
|
|
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;IAmBxD,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"}
|
package/dist/mysql.service.js
CHANGED
|
@@ -16,9 +16,10 @@ exports.MysqlService = void 0;
|
|
|
16
16
|
const core_1 = require("@joktec/core");
|
|
17
17
|
const lodash_1 = require("lodash");
|
|
18
18
|
const typeorm_1 = require("typeorm");
|
|
19
|
-
const
|
|
19
|
+
const mysql_benchmark_1 = require("./mysql.benchmark");
|
|
20
20
|
const mysql_client_1 = require("./mysql.client");
|
|
21
21
|
const mysql_config_1 = require("./mysql.config");
|
|
22
|
+
const mysql_strategy_1 = require("./mysql.strategy");
|
|
22
23
|
const RETRY_OPTS = 'mysql.retry';
|
|
23
24
|
let MysqlService = class MysqlService extends core_1.AbstractClientService {
|
|
24
25
|
constructor(modelRegistry) {
|
|
@@ -30,8 +31,9 @@ let MysqlService = class MysqlService extends core_1.AbstractClientService {
|
|
|
30
31
|
const options = {
|
|
31
32
|
...config,
|
|
32
33
|
type: config.dialect,
|
|
33
|
-
namingStrategy: new
|
|
34
|
+
namingStrategy: new mysql_strategy_1.MysqlNamingStrategy(),
|
|
34
35
|
entities: [...this.modelRegistry[config.conId]],
|
|
36
|
+
logger: new mysql_benchmark_1.MysqlBenchmark(config.benchmark, this.logService),
|
|
35
37
|
};
|
|
36
38
|
if (config.slaves?.length) {
|
|
37
39
|
options['replication'] = { master: { ...connection }, slaves: [...config.slaves] };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.service.js","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA6G;AAC7G,mCAA8B;AAC9B,qCAA+D;
|
|
1
|
+
{"version":3,"file":"mysql.service.js","sourceRoot":"","sources":["../src/mysql.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { DefaultNamingStrategy, NamingStrategyInterface } from 'typeorm';
|
|
2
|
+
export declare class MysqlNamingStrategy extends DefaultNamingStrategy implements NamingStrategyInterface {
|
|
3
|
+
tableName(className: string, customName: string): string;
|
|
4
|
+
columnName(propertyName: string, customName: string, embeddedPrefixes: string[]): string;
|
|
5
|
+
relationName(propertyName: string): string;
|
|
6
|
+
joinColumnName(relationName: string, referencedColumnName: string): string;
|
|
7
|
+
joinTableName(firstTableName: string, secondTableName: string, firstPropertyName: string, secondPropertyName: string): string;
|
|
8
|
+
joinTableColumnName(tableName: string, propertyName: string, columnName?: string): string;
|
|
9
|
+
indexName(tableOrName: string, columnNames: string[]): string;
|
|
10
|
+
uniqueConstraintName(tableOrName: string, columnNames: string[]): string;
|
|
11
|
+
foreignKeyName(tableOrName: string, columnNames: string[], _referencedTablePath?: string, _referencedColumnNames?: string[]): string;
|
|
12
|
+
classTableInheritanceParentColumnName(parentTableName: any, parentTableIdPropertyName: any): string;
|
|
13
|
+
eagerJoinRelationAlias(alias: string, propertyPath: string): string;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=mysql.strategy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mysql.strategy.d.ts","sourceRoot":"","sources":["../src/mysql.strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAGzE,qBAAa,mBAAoB,SAAQ,qBAAsB,YAAW,uBAAuB;IAC/F,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIxD,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM;IAIxF,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI1C,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM;IAI1E,aAAa,CACX,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,iBAAiB,EAAE,MAAM,EACzB,kBAAkB,EAAE,MAAM,GACzB,MAAM;IAIT,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAIzF,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM;IAI7D,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM;IAIxE,cAAc,CACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EAAE,EACrB,oBAAoB,CAAC,EAAE,MAAM,EAC7B,sBAAsB,CAAC,EAAE,MAAM,EAAE,GAChC,MAAM;IAUT,qCAAqC,CAAC,eAAe,EAAE,GAAG,EAAE,yBAAyB,EAAE,GAAG,GAAG,MAAM;IAInG,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;CAGpE"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MysqlNamingStrategy = void 0;
|
|
4
|
+
const core_1 = require("@joktec/core");
|
|
5
|
+
const typeorm_1 = require("typeorm");
|
|
6
|
+
const StringUtils_1 = require("typeorm/util/StringUtils");
|
|
7
|
+
class MysqlNamingStrategy extends typeorm_1.DefaultNamingStrategy {
|
|
8
|
+
tableName(className, customName) {
|
|
9
|
+
return customName ? customName : (0, StringUtils_1.snakeCase)((0, core_1.toPlural)(className));
|
|
10
|
+
}
|
|
11
|
+
columnName(propertyName, customName, embeddedPrefixes) {
|
|
12
|
+
return (0, StringUtils_1.snakeCase)(embeddedPrefixes.concat('').join('_')) + (customName ? customName : (0, StringUtils_1.snakeCase)(propertyName));
|
|
13
|
+
}
|
|
14
|
+
relationName(propertyName) {
|
|
15
|
+
return (0, StringUtils_1.snakeCase)(propertyName);
|
|
16
|
+
}
|
|
17
|
+
joinColumnName(relationName, referencedColumnName) {
|
|
18
|
+
return (0, StringUtils_1.snakeCase)(relationName + '_' + referencedColumnName);
|
|
19
|
+
}
|
|
20
|
+
joinTableName(firstTableName, secondTableName, firstPropertyName, secondPropertyName) {
|
|
21
|
+
return (0, StringUtils_1.snakeCase)(firstTableName + '_' + firstPropertyName.replace(/\./gi, '_') + '_' + secondTableName);
|
|
22
|
+
}
|
|
23
|
+
joinTableColumnName(tableName, propertyName, columnName) {
|
|
24
|
+
return (0, StringUtils_1.snakeCase)(tableName + '_' + (columnName ? columnName : propertyName));
|
|
25
|
+
}
|
|
26
|
+
indexName(tableOrName, columnNames) {
|
|
27
|
+
return `idx_${tableOrName}_${columnNames.join('_')}`;
|
|
28
|
+
}
|
|
29
|
+
uniqueConstraintName(tableOrName, columnNames) {
|
|
30
|
+
return `unq_${tableOrName}_${columnNames.join('_')}`;
|
|
31
|
+
}
|
|
32
|
+
foreignKeyName(tableOrName, columnNames, _referencedTablePath, _referencedColumnNames) {
|
|
33
|
+
const baseForeignKeyName = `fk_${tableOrName}_${columnNames.join('_')}`;
|
|
34
|
+
if (_referencedTablePath && _referencedColumnNames) {
|
|
35
|
+
const referencedTable = _referencedTablePath;
|
|
36
|
+
const referencedColumns = _referencedColumnNames.join('_');
|
|
37
|
+
return `${baseForeignKeyName}_to_${referencedTable}_${referencedColumns}`;
|
|
38
|
+
}
|
|
39
|
+
return baseForeignKeyName;
|
|
40
|
+
}
|
|
41
|
+
classTableInheritanceParentColumnName(parentTableName, parentTableIdPropertyName) {
|
|
42
|
+
return (0, StringUtils_1.snakeCase)(parentTableName + '_' + parentTableIdPropertyName);
|
|
43
|
+
}
|
|
44
|
+
eagerJoinRelationAlias(alias, propertyPath) {
|
|
45
|
+
return alias + '__' + propertyPath.replace('.', '_');
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
exports.MysqlNamingStrategy = MysqlNamingStrategy;
|
|
49
|
+
//# sourceMappingURL=mysql.strategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mysql.strategy.js","sourceRoot":"","sources":["../src/mysql.strategy.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AACxC,qCAAyE;AACzE,0DAAqD;AAErD,MAAa,mBAAoB,SAAQ,+BAAqB;IAC5D,SAAS,CAAC,SAAiB,EAAE,UAAkB;QAC7C,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,uBAAS,EAAC,IAAA,eAAQ,EAAC,SAAS,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,UAAU,CAAC,YAAoB,EAAE,UAAkB,EAAE,gBAA0B;QAC7E,OAAO,IAAA,uBAAS,EAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,uBAAS,EAAC,YAAY,CAAC,CAAC,CAAC;IAChH,CAAC;IAED,YAAY,CAAC,YAAoB;QAC/B,OAAO,IAAA,uBAAS,EAAC,YAAY,CAAC,CAAC;IACjC,CAAC;IAED,cAAc,CAAC,YAAoB,EAAE,oBAA4B;QAC/D,OAAO,IAAA,uBAAS,EAAC,YAAY,GAAG,GAAG,GAAG,oBAAoB,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CACX,cAAsB,EACtB,eAAuB,EACvB,iBAAyB,EACzB,kBAA0B;QAE1B,OAAO,IAAA,uBAAS,EAAC,cAAc,GAAG,GAAG,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,eAAe,CAAC,CAAC;IAC1G,CAAC;IAED,mBAAmB,CAAC,SAAiB,EAAE,YAAoB,EAAE,UAAmB;QAC9E,OAAO,IAAA,uBAAS,EAAC,SAAS,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,SAAS,CAAC,WAAmB,EAAE,WAAqB;QAClD,OAAO,OAAO,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACvD,CAAC;IAED,oBAAoB,CAAC,WAAmB,EAAE,WAAqB;QAC7D,OAAO,OAAO,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACvD,CAAC;IAED,cAAc,CACZ,WAAmB,EACnB,WAAqB,EACrB,oBAA6B,EAC7B,sBAAiC;QAEjC,MAAM,kBAAkB,GAAG,MAAM,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACxE,IAAI,oBAAoB,IAAI,sBAAsB,EAAE,CAAC;YACnD,MAAM,eAAe,GAAG,oBAAoB,CAAC;YAC7C,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3D,OAAO,GAAG,kBAAkB,OAAO,eAAe,IAAI,iBAAiB,EAAE,CAAC;QAC5E,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,qCAAqC,CAAC,eAAoB,EAAE,yBAA8B;QACxF,OAAO,IAAA,uBAAS,EAAC,eAAe,GAAG,GAAG,GAAG,yBAAyB,CAAC,CAAC;IACtE,CAAC;IAED,sBAAsB,CAAC,KAAa,EAAE,YAAoB;QACxD,OAAO,KAAK,GAAG,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;CACF;AA5DD,kDA4DC"}
|