tspace-mysql 1.7.6 → 1.7.8
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/build/lib/connection/index.js +3 -0
- package/build/lib/connection/index.js.map +1 -1
- package/build/lib/core/Builder.d.ts +1 -0
- package/build/lib/core/Builder.js +15 -12
- package/build/lib/core/Builder.js.map +1 -1
- package/build/lib/core/Handlers/Relation.js +2 -1
- package/build/lib/core/Handlers/Relation.js.map +1 -1
- package/build/lib/core/JoinModel.js +7 -1
- package/build/lib/core/JoinModel.js.map +1 -1
- package/build/lib/core/Model.d.ts +2 -0
- package/build/lib/core/Model.js +5 -4
- package/build/lib/core/Model.js.map +1 -1
- package/build/lib/utils/index.js +0 -5
- package/build/lib/utils/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -171,15 +171,18 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
171
171
|
console.log(this._messageSlowQuery(duration, sql));
|
|
172
172
|
this.emit('slowQuery', {
|
|
173
173
|
sql,
|
|
174
|
+
results,
|
|
174
175
|
execution: duration
|
|
175
176
|
});
|
|
176
177
|
}
|
|
177
178
|
this.emit('query', {
|
|
178
179
|
sql,
|
|
180
|
+
results,
|
|
179
181
|
execution: duration
|
|
180
182
|
});
|
|
181
183
|
this.emit(this._detectQueryType(sql), {
|
|
182
184
|
sql,
|
|
185
|
+
results,
|
|
183
186
|
execution: duration
|
|
184
187
|
});
|
|
185
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/connection/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAiC;AACjC,gDAAmC;AACnC,mCAAqC;AACrC,mCAKe;AAEf,sDAEmB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/connection/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
71
71
|
this.$state.set('LIMIT', '');
|
|
72
72
|
if ((options === null || options === void 0 ? void 0 : options.offset) != null && options.offset)
|
|
73
73
|
this.$state.set('OFFSET', '');
|
|
74
|
+
if ((options === null || options === void 0 ? void 0 : options.alias) != null && options.alias)
|
|
75
|
+
this.$state.set('RAW_ALIAS', '');
|
|
74
76
|
return this;
|
|
75
77
|
}
|
|
76
78
|
/**
|
|
@@ -2334,7 +2336,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
2334
2336
|
return '*';
|
|
2335
2337
|
const alias = this.$state.get('ALIAS');
|
|
2336
2338
|
return [
|
|
2337
|
-
alias == null
|
|
2339
|
+
alias == null || alias === ''
|
|
2338
2340
|
? `\`${this.getTableName().replace(/`/g, '')}\``
|
|
2339
2341
|
: `\`${alias.replace(/`/g, '')}\``,
|
|
2340
2342
|
'.',
|
|
@@ -2591,6 +2593,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
2591
2593
|
.copyBuilder(this, { where: true, join: true })
|
|
2592
2594
|
.bind(this.$pool.get())
|
|
2593
2595
|
.debug(this.$state.get('DEBUG'))
|
|
2596
|
+
.unset({ alias: true })
|
|
2594
2597
|
.count();
|
|
2595
2598
|
let lastPage = Math.ceil(total / limit) || 0;
|
|
2596
2599
|
lastPage = lastPage > 1 ? lastPage : 1;
|
|
@@ -2979,7 +2982,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
2979
2982
|
this.limit(1);
|
|
2980
2983
|
this.$state.set('DELETE', [
|
|
2981
2984
|
`${this.$constants('DELETE')}`,
|
|
2982
|
-
`${this.$
|
|
2985
|
+
`${this.$constants('FROM')}`,
|
|
2983
2986
|
`${this.$state.get('TABLE_NAME')}`,
|
|
2984
2987
|
].join(' '));
|
|
2985
2988
|
const result = yield this._actionStatement({ sql: this._queryBuilder().delete() });
|
|
@@ -3001,7 +3004,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3001
3004
|
}
|
|
3002
3005
|
this.$state.set('DELETE', [
|
|
3003
3006
|
`${this.$constants('DELETE')}`,
|
|
3004
|
-
`${this.$
|
|
3007
|
+
`${this.$constants('FROM')}`,
|
|
3005
3008
|
`${this.$state.get('TABLE_NAME')}`,
|
|
3006
3009
|
].join(' '));
|
|
3007
3010
|
const result = yield this._actionStatement({ sql: this._queryBuilder().delete() });
|
|
@@ -3023,7 +3026,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3023
3026
|
return __awaiter(this, void 0, void 0, function* () {
|
|
3024
3027
|
this.$state.set('DELETE', [
|
|
3025
3028
|
`${this.$constants('DELETE')}`,
|
|
3026
|
-
`${this.$
|
|
3029
|
+
`${this.$constants('FROM')}`,
|
|
3027
3030
|
`${this.$state.get('TABLE_NAME')}`
|
|
3028
3031
|
].join(' '));
|
|
3029
3032
|
const result = yield this._actionStatement({ sql: this._queryBuilder().delete() });
|
|
@@ -3552,10 +3555,10 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3552
3555
|
return `${this.$constants('SELECT')} ${values.join(', ')}`;
|
|
3553
3556
|
};
|
|
3554
3557
|
const bindFrom = ({ from, table, alias, rawAlias }) => {
|
|
3555
|
-
if (alias != null) {
|
|
3556
|
-
if (rawAlias != null) {
|
|
3557
|
-
const
|
|
3558
|
-
const normalizedRawAlias =
|
|
3558
|
+
if (alias != null && alias !== '') {
|
|
3559
|
+
if (rawAlias != null && rawAlias !== '') {
|
|
3560
|
+
const raw = String(rawAlias).replace(/^\(\s*|\s*\)$/g, '').trim();
|
|
3561
|
+
const normalizedRawAlias = raw.startsWith('(') && raw.endsWith(')') ? raw.slice(1, -1) : raw;
|
|
3559
3562
|
return `${from} (${normalizedRawAlias}) ${this.$constants('AS')} \`${alias}\``;
|
|
3560
3563
|
}
|
|
3561
3564
|
return `${from} ${table} ${this.$constants('AS')} \`${alias}\``;
|
|
@@ -3571,7 +3574,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3571
3574
|
const sql = buildSQL([
|
|
3572
3575
|
bindSelect(this.$state.get('SELECT')),
|
|
3573
3576
|
bindFrom({
|
|
3574
|
-
from: this.$
|
|
3577
|
+
from: this.$constants('FROM'),
|
|
3575
3578
|
table: this.$state.get('TABLE_NAME'),
|
|
3576
3579
|
alias: this.$state.get('ALIAS'),
|
|
3577
3580
|
rawAlias: this.$state.get('RAW_ALIAS')
|
|
@@ -3677,7 +3680,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3677
3680
|
`${this.$constants('SELECT')}`,
|
|
3678
3681
|
`${this.$constants('EXISTS')}(${this.$constants('SELECT')}`,
|
|
3679
3682
|
`*`,
|
|
3680
|
-
`${this.$
|
|
3683
|
+
`${this.$constants('FROM')}`,
|
|
3681
3684
|
`${this.$state.get('TABLE_NAME')}`,
|
|
3682
3685
|
`${this._queryBuilder().where()}`,
|
|
3683
3686
|
`${this.$constants('LIMIT')} 1)`,
|
|
@@ -3770,7 +3773,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3770
3773
|
`${this.$constants('SELECT')}`,
|
|
3771
3774
|
`${this.$constants('EXISTS')}(${this.$constants('SELECT')}`,
|
|
3772
3775
|
`1`,
|
|
3773
|
-
`${this.$
|
|
3776
|
+
`${this.$constants('FROM')}`,
|
|
3774
3777
|
`${this.$state.get('TABLE_NAME')}`,
|
|
3775
3778
|
`${this._queryBuilder().where()}`,
|
|
3776
3779
|
`${this.$constants('LIMIT')} 1)`,
|
|
@@ -3824,7 +3827,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3824
3827
|
`${this.$constants('SELECT')}`,
|
|
3825
3828
|
`${this.$constants('EXISTS')}(${this.$constants('SELECT')}`,
|
|
3826
3829
|
`1`,
|
|
3827
|
-
`${this.$
|
|
3830
|
+
`${this.$constants('FROM')}`,
|
|
3828
3831
|
`${this.$state.get('TABLE_NAME')}`,
|
|
3829
3832
|
`${this._queryBuilder().where()}`,
|
|
3830
3833
|
`${this.$constants('LIMIT')} 1)`,
|