tspace-mysql 1.1.4 → 1.1.5
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/lib/constants/index.d.ts +4 -0
- package/dist/lib/constants/index.js +7 -4
- package/dist/lib/tspace/DB.d.ts +36 -6
- package/dist/lib/tspace/DB.js +44 -6
- package/dist/lib/tspace/Database.d.ts +6 -1
- package/dist/lib/tspace/Database.js +55 -80
- package/dist/lib/tspace/Model.js +29 -14
- package/package.json +3 -3
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
exports.CONSTANTS = void 0;
|
|
4
|
+
var CONSTANTS = {
|
|
4
5
|
ID: 'ID',
|
|
5
6
|
SHOW: 'SHOW',
|
|
6
7
|
FIELDS: 'FIELDS',
|
|
@@ -43,7 +44,7 @@ var constant = {
|
|
|
43
44
|
NOT: 'NOT',
|
|
44
45
|
DUPLICATE: 'DUPLICATE',
|
|
45
46
|
KEY: 'KEY',
|
|
46
|
-
RAW: 'RAW',
|
|
47
|
+
RAW: '$RAW',
|
|
47
48
|
WHEN: 'WHEN',
|
|
48
49
|
THEN: 'THEN',
|
|
49
50
|
ELSE: 'ELSE',
|
|
@@ -74,6 +75,7 @@ var constant = {
|
|
|
74
75
|
},
|
|
75
76
|
DB: {
|
|
76
77
|
PRIMARY_KEY: 'id',
|
|
78
|
+
VOID: false,
|
|
77
79
|
RESULT: null,
|
|
78
80
|
DISTINCT: '',
|
|
79
81
|
PLUCK: '',
|
|
@@ -104,6 +106,7 @@ var constant = {
|
|
|
104
106
|
},
|
|
105
107
|
MODEL: {
|
|
106
108
|
PRIMARY_KEY: 'id',
|
|
109
|
+
VOID: false,
|
|
107
110
|
SELECT: '',
|
|
108
111
|
DELETE: '',
|
|
109
112
|
UPDATE: '',
|
|
@@ -147,5 +150,5 @@ var constant = {
|
|
|
147
150
|
SAVE: ''
|
|
148
151
|
}
|
|
149
152
|
};
|
|
150
|
-
exports.
|
|
151
|
-
|
|
153
|
+
exports.CONSTANTS = CONSTANTS;
|
|
154
|
+
exports.default = Object.freeze(CONSTANTS);
|
package/dist/lib/tspace/DB.d.ts
CHANGED
|
@@ -8,6 +8,14 @@ declare class DB extends AbstractDB {
|
|
|
8
8
|
* @return {this} this
|
|
9
9
|
*/
|
|
10
10
|
table(table: string): this;
|
|
11
|
+
/**
|
|
12
|
+
* Get constant
|
|
13
|
+
* @param {string} constant
|
|
14
|
+
* @return {string | object} string || object
|
|
15
|
+
*/
|
|
16
|
+
constants(constant?: string): string | {
|
|
17
|
+
[key: string]: any;
|
|
18
|
+
};
|
|
11
19
|
/**
|
|
12
20
|
* cases query
|
|
13
21
|
* @param {array} cases array
|
|
@@ -19,9 +27,15 @@ declare class DB extends AbstractDB {
|
|
|
19
27
|
* @return {string} string
|
|
20
28
|
*/
|
|
21
29
|
generateUUID(): string;
|
|
30
|
+
/**
|
|
31
|
+
* Assign raw query for schema validation
|
|
32
|
+
* @param {string} sql
|
|
33
|
+
* @return {string} string
|
|
34
|
+
*/
|
|
35
|
+
raw(sql: string): string;
|
|
22
36
|
/**
|
|
23
37
|
* Get a connection
|
|
24
|
-
* @return {ConnectionTransaction}
|
|
38
|
+
* @return {ConnectionTransaction} object
|
|
25
39
|
* @type {object} connection
|
|
26
40
|
* @property {function} connection.query - execute query sql then release connection to pool
|
|
27
41
|
* @property {function} connection.startTransaction - start transaction of query
|
|
@@ -47,15 +61,31 @@ declare class DB extends AbstractDB {
|
|
|
47
61
|
then: string;
|
|
48
62
|
}[]): string;
|
|
49
63
|
/**
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
64
|
+
* Assign raw query for schema validation
|
|
65
|
+
* @static
|
|
66
|
+
* @param {string} sql
|
|
67
|
+
* @return {string} string
|
|
68
|
+
*/
|
|
69
|
+
static raw(sql: string): string;
|
|
70
|
+
/**
|
|
71
|
+
* generate UUID
|
|
72
|
+
* @static
|
|
73
|
+
* @return {string} string
|
|
74
|
+
*/
|
|
54
75
|
static generateUUID(): string;
|
|
76
|
+
/**
|
|
77
|
+
* Get constant
|
|
78
|
+
* @static
|
|
79
|
+
* @param {string} constant
|
|
80
|
+
* @return {string | object} string || object
|
|
81
|
+
*/
|
|
82
|
+
static constants(constant?: string): string | {
|
|
83
|
+
[key: string]: any;
|
|
84
|
+
};
|
|
55
85
|
/**
|
|
56
86
|
* Get a connection
|
|
57
87
|
* @static
|
|
58
|
-
* @return {ConnectionTransaction}
|
|
88
|
+
* @return {ConnectionTransaction} object
|
|
59
89
|
* @type {object} connection
|
|
60
90
|
* @property {function} connection.query - execute query sql then release connection to pool
|
|
61
91
|
* @property {function} connection.startTransaction - start transaction of query
|
package/dist/lib/tspace/DB.js
CHANGED
|
@@ -121,6 +121,14 @@ var DB = /** @class */ (function (_super) {
|
|
|
121
121
|
this.$db.set('FROM', "".concat(this.$constants('FROM')));
|
|
122
122
|
return this;
|
|
123
123
|
};
|
|
124
|
+
/**
|
|
125
|
+
* Get constant
|
|
126
|
+
* @param {string} constant
|
|
127
|
+
* @return {string | object} string || object
|
|
128
|
+
*/
|
|
129
|
+
DB.prototype.constants = function (constant) {
|
|
130
|
+
return this.$constants(constant);
|
|
131
|
+
};
|
|
124
132
|
/**
|
|
125
133
|
* cases query
|
|
126
134
|
* @param {array} cases array
|
|
@@ -128,6 +136,8 @@ var DB = /** @class */ (function (_super) {
|
|
|
128
136
|
*/
|
|
129
137
|
DB.prototype.caseUpdate = function (cases) {
|
|
130
138
|
var e_1, _a;
|
|
139
|
+
if (!cases.length)
|
|
140
|
+
return '';
|
|
131
141
|
var query = [];
|
|
132
142
|
try {
|
|
133
143
|
for (var cases_1 = __values(cases), cases_1_1 = cases_1.next(); !cases_1_1.done; cases_1_1 = cases_1.next()) {
|
|
@@ -162,9 +172,17 @@ var DB = /** @class */ (function (_super) {
|
|
|
162
172
|
DB.prototype.generateUUID = function () {
|
|
163
173
|
return this.$utils.generateUUID();
|
|
164
174
|
};
|
|
175
|
+
/**
|
|
176
|
+
* Assign raw query for schema validation
|
|
177
|
+
* @param {string} sql
|
|
178
|
+
* @return {string} string
|
|
179
|
+
*/
|
|
180
|
+
DB.prototype.raw = function (sql) {
|
|
181
|
+
return "".concat(this.$constants('RAW'), " ").concat(sql);
|
|
182
|
+
};
|
|
165
183
|
/**
|
|
166
184
|
* Get a connection
|
|
167
|
-
* @return {ConnectionTransaction}
|
|
185
|
+
* @return {ConnectionTransaction} object
|
|
168
186
|
* @type {object} connection
|
|
169
187
|
* @property {function} connection.query - execute query sql then release connection to pool
|
|
170
188
|
* @property {function} connection.startTransaction - start transaction of query
|
|
@@ -206,6 +224,8 @@ var DB = /** @class */ (function (_super) {
|
|
|
206
224
|
*/
|
|
207
225
|
DB.caseUpdate = function (cases) {
|
|
208
226
|
var e_2, _a;
|
|
227
|
+
if (!cases.length)
|
|
228
|
+
return '';
|
|
209
229
|
var self = new this();
|
|
210
230
|
var query = [];
|
|
211
231
|
try {
|
|
@@ -235,17 +255,35 @@ var DB = /** @class */ (function (_super) {
|
|
|
235
255
|
].join(' ');
|
|
236
256
|
};
|
|
237
257
|
/**
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
258
|
+
* Assign raw query for schema validation
|
|
259
|
+
* @static
|
|
260
|
+
* @param {string} sql
|
|
261
|
+
* @return {string} string
|
|
262
|
+
*/
|
|
263
|
+
DB.raw = function (sql) {
|
|
264
|
+
return "".concat(new this().$constants('RAW'), " ").concat(sql);
|
|
265
|
+
};
|
|
266
|
+
/**
|
|
267
|
+
* generate UUID
|
|
268
|
+
* @static
|
|
269
|
+
* @return {string} string
|
|
270
|
+
*/
|
|
242
271
|
DB.generateUUID = function () {
|
|
243
272
|
return new this().$utils.generateUUID();
|
|
244
273
|
};
|
|
274
|
+
/**
|
|
275
|
+
* Get constant
|
|
276
|
+
* @static
|
|
277
|
+
* @param {string} constant
|
|
278
|
+
* @return {string | object} string || object
|
|
279
|
+
*/
|
|
280
|
+
DB.constants = function (constant) {
|
|
281
|
+
return new this().$constants(constant);
|
|
282
|
+
};
|
|
245
283
|
/**
|
|
246
284
|
* Get a connection
|
|
247
285
|
* @static
|
|
248
|
-
* @return {ConnectionTransaction}
|
|
286
|
+
* @return {ConnectionTransaction} object
|
|
249
287
|
* @type {object} connection
|
|
250
288
|
* @property {function} connection.query - execute query sql then release connection to pool
|
|
251
289
|
* @property {function} connection.startTransaction - start transaction of query
|
|
@@ -15,6 +15,11 @@ declare class Database extends AbstractDatabase {
|
|
|
15
15
|
* @return {this} this
|
|
16
16
|
*/
|
|
17
17
|
except(...columns: Array<string>): this;
|
|
18
|
+
/**
|
|
19
|
+
* data will return void
|
|
20
|
+
* @return {this} this
|
|
21
|
+
*/
|
|
22
|
+
void(): this;
|
|
18
23
|
/**
|
|
19
24
|
*
|
|
20
25
|
* @param {...string} columns show only colums selected
|
|
@@ -381,7 +386,7 @@ declare class Database extends AbstractDatabase {
|
|
|
381
386
|
*/
|
|
382
387
|
pool(pool: Connection): this;
|
|
383
388
|
/**
|
|
384
|
-
*
|
|
389
|
+
* make sure this connection has same transaction in pool connection
|
|
385
390
|
* @param {object} connection pool database
|
|
386
391
|
* @return {this} this
|
|
387
392
|
*/
|
|
@@ -117,7 +117,7 @@ var fs_1 = __importDefault(require("fs"));
|
|
|
117
117
|
var sql_formatter_1 = require("sql-formatter");
|
|
118
118
|
var AbstractDatabase_1 = __importDefault(require("./AbstractDatabase"));
|
|
119
119
|
var utils_1 = __importDefault(require("../utils"));
|
|
120
|
-
var constants_1 =
|
|
120
|
+
var constants_1 = require("../constants");
|
|
121
121
|
var DB_1 = __importDefault(require("./DB"));
|
|
122
122
|
var connection_1 = require("../connection");
|
|
123
123
|
var Database = /** @class */ (function (_super) {
|
|
@@ -149,6 +149,14 @@ var Database = /** @class */ (function (_super) {
|
|
|
149
149
|
this.$db.set('EXCEPT', columns.length ? columns : ['id']);
|
|
150
150
|
return this;
|
|
151
151
|
};
|
|
152
|
+
/**
|
|
153
|
+
* data will return void
|
|
154
|
+
* @return {this} this
|
|
155
|
+
*/
|
|
156
|
+
Database.prototype.void = function () {
|
|
157
|
+
this.$db.set('VOID', true);
|
|
158
|
+
return this;
|
|
159
|
+
};
|
|
152
160
|
/**
|
|
153
161
|
*
|
|
154
162
|
* @param {...string} columns show only colums selected
|
|
@@ -1138,7 +1146,7 @@ var Database = /** @class */ (function (_super) {
|
|
|
1138
1146
|
return this;
|
|
1139
1147
|
};
|
|
1140
1148
|
/**
|
|
1141
|
-
*
|
|
1149
|
+
* make sure this connection has same transaction in pool connection
|
|
1142
1150
|
* @param {object} connection pool database
|
|
1143
1151
|
* @return {this} this
|
|
1144
1152
|
*/
|
|
@@ -2427,11 +2435,10 @@ var Database = /** @class */ (function (_super) {
|
|
|
2427
2435
|
return "".concat(this.$db.get('TABLE_NAME'), ".`").concat(column, "`");
|
|
2428
2436
|
};
|
|
2429
2437
|
Database.prototype._insertNotExists = function () {
|
|
2430
|
-
var _a;
|
|
2431
2438
|
return __awaiter(this, void 0, void 0, function () {
|
|
2432
|
-
var sql,
|
|
2433
|
-
return __generator(this, function (
|
|
2434
|
-
switch (
|
|
2439
|
+
var sql, _a, result, check, _b, _c, result_1, id, sql_1, data;
|
|
2440
|
+
return __generator(this, function (_d) {
|
|
2441
|
+
switch (_d.label) {
|
|
2435
2442
|
case 0:
|
|
2436
2443
|
if (!this.$db.get('WHERE'))
|
|
2437
2444
|
throw new Error("Can't insert not exists without where condition");
|
|
@@ -2447,10 +2454,10 @@ var Database = /** @class */ (function (_super) {
|
|
|
2447
2454
|
].join(' ');
|
|
2448
2455
|
return [4 /*yield*/, this._queryStatement(sql)];
|
|
2449
2456
|
case 1:
|
|
2450
|
-
|
|
2457
|
+
_a = __read.apply(void 0, [_d.sent(), 1]), result = _a[0].exists;
|
|
2451
2458
|
check = !!Number.parseInt(result);
|
|
2452
|
-
|
|
2453
|
-
switch (
|
|
2459
|
+
_b = check;
|
|
2460
|
+
switch (_b) {
|
|
2454
2461
|
case false: return [3 /*break*/, 2];
|
|
2455
2462
|
case true: return [3 /*break*/, 6];
|
|
2456
2463
|
}
|
|
@@ -2460,13 +2467,9 @@ var Database = /** @class */ (function (_super) {
|
|
|
2460
2467
|
returnId: true
|
|
2461
2468
|
})];
|
|
2462
2469
|
case 3:
|
|
2463
|
-
|
|
2464
|
-
if (this.$db.get('
|
|
2465
|
-
|
|
2466
|
-
table: this.$db.get('TABLE_NAME'),
|
|
2467
|
-
id: id
|
|
2468
|
-
});
|
|
2469
|
-
}
|
|
2470
|
+
_c = __read.apply(void 0, [_d.sent(), 2]), result_1 = _c[0], id = _c[1];
|
|
2471
|
+
if (this.$db.get('VOID'))
|
|
2472
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2470
2473
|
if (!result_1) return [3 /*break*/, 5];
|
|
2471
2474
|
sql_1 = [
|
|
2472
2475
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2476,19 +2479,23 @@ var Database = /** @class */ (function (_super) {
|
|
|
2476
2479
|
].join(' ');
|
|
2477
2480
|
return [4 /*yield*/, this._queryStatement(sql_1)];
|
|
2478
2481
|
case 4:
|
|
2479
|
-
data =
|
|
2482
|
+
data = _d.sent();
|
|
2480
2483
|
return [2 /*return*/, (data === null || data === void 0 ? void 0 : data.shift()) || null];
|
|
2481
2484
|
case 5: return [2 /*return*/, null];
|
|
2482
2485
|
case 6:
|
|
2483
2486
|
{
|
|
2487
|
+
if (this.$db.get('VOID'))
|
|
2488
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2484
2489
|
return [2 /*return*/, null];
|
|
2485
2490
|
}
|
|
2486
|
-
|
|
2491
|
+
_d.label = 7;
|
|
2487
2492
|
case 7:
|
|
2488
2493
|
{
|
|
2494
|
+
if (this.$db.get('VOID'))
|
|
2495
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2489
2496
|
return [2 /*return*/, null];
|
|
2490
2497
|
}
|
|
2491
|
-
|
|
2498
|
+
_d.label = 8;
|
|
2492
2499
|
case 8: return [2 /*return*/];
|
|
2493
2500
|
}
|
|
2494
2501
|
});
|
|
@@ -2562,12 +2569,8 @@ var Database = /** @class */ (function (_super) {
|
|
|
2562
2569
|
})];
|
|
2563
2570
|
case 1:
|
|
2564
2571
|
_a = __read.apply(void 0, [_b.sent(), 2]), result = _a[0], id = _a[1];
|
|
2565
|
-
if (this.$db.get('
|
|
2566
|
-
|
|
2567
|
-
table: this.$db.get('TABLE_NAME'),
|
|
2568
|
-
id: id
|
|
2569
|
-
});
|
|
2570
|
-
}
|
|
2572
|
+
if (this.$db.get('VOID'))
|
|
2573
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2571
2574
|
if (!result) return [3 /*break*/, 3];
|
|
2572
2575
|
sql = [
|
|
2573
2576
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2588,36 +2591,19 @@ var Database = /** @class */ (function (_super) {
|
|
|
2588
2591
|
};
|
|
2589
2592
|
Database.prototype._createMultiple = function () {
|
|
2590
2593
|
return __awaiter(this, void 0, void 0, function () {
|
|
2591
|
-
var _a, result, id, arrayId,
|
|
2592
|
-
|
|
2593
|
-
|
|
2594
|
-
switch (_c.label) {
|
|
2594
|
+
var _a, result, id, arrayId, sql, data, resultData;
|
|
2595
|
+
return __generator(this, function (_b) {
|
|
2596
|
+
switch (_b.label) {
|
|
2595
2597
|
case 0: return [4 /*yield*/, this._actionStatement({
|
|
2596
2598
|
sql: this.$db.get('INSERT'),
|
|
2597
2599
|
returnId: true
|
|
2598
2600
|
})];
|
|
2599
2601
|
case 1:
|
|
2600
|
-
_a = __read.apply(void 0, [
|
|
2602
|
+
_a = __read.apply(void 0, [_b.sent(), 2]), result = _a[0], id = _a[1];
|
|
2603
|
+
if (this.$db.get('VOID'))
|
|
2604
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2601
2605
|
if (!result) return [3 /*break*/, 3];
|
|
2602
2606
|
arrayId = __spreadArray([], __read(Array(result)), false).map(function (_, i) { return i + id; });
|
|
2603
|
-
try {
|
|
2604
|
-
for (arrayId_1 = __values(arrayId), arrayId_1_1 = arrayId_1.next(); !arrayId_1_1.done; arrayId_1_1 = arrayId_1.next()) {
|
|
2605
|
-
id_1 = arrayId_1_1.value;
|
|
2606
|
-
if (this.$db.get('TRANSACTION')) {
|
|
2607
|
-
this.$db.get('TRANSACTION').query.push({
|
|
2608
|
-
table: this.$db.get('TABLE_NAME'),
|
|
2609
|
-
id: id_1
|
|
2610
|
-
});
|
|
2611
|
-
}
|
|
2612
|
-
}
|
|
2613
|
-
}
|
|
2614
|
-
catch (e_6_1) { e_6 = { error: e_6_1 }; }
|
|
2615
|
-
finally {
|
|
2616
|
-
try {
|
|
2617
|
-
if (arrayId_1_1 && !arrayId_1_1.done && (_b = arrayId_1.return)) _b.call(arrayId_1);
|
|
2618
|
-
}
|
|
2619
|
-
finally { if (e_6) throw e_6.error; }
|
|
2620
|
-
}
|
|
2621
2607
|
sql = [
|
|
2622
2608
|
"".concat(this.$db.get('SELECT')),
|
|
2623
2609
|
"".concat(this.$db.get('FROM')),
|
|
@@ -2627,7 +2613,7 @@ var Database = /** @class */ (function (_super) {
|
|
|
2627
2613
|
].join(' ');
|
|
2628
2614
|
return [4 /*yield*/, this._queryStatement(sql)];
|
|
2629
2615
|
case 2:
|
|
2630
|
-
data =
|
|
2616
|
+
data = _b.sent();
|
|
2631
2617
|
resultData = data || null;
|
|
2632
2618
|
this.$db.set('RESULT', resultData);
|
|
2633
2619
|
return [2 /*return*/, resultData];
|
|
@@ -2639,7 +2625,7 @@ var Database = /** @class */ (function (_super) {
|
|
|
2639
2625
|
Database.prototype._updateOrInsert = function () {
|
|
2640
2626
|
return __awaiter(this, void 0, void 0, function () {
|
|
2641
2627
|
var sql, check, _a, result, _b, _c, result_4, id, sql_2, data, resultData, result_5, data, data_2, data_2_1, val;
|
|
2642
|
-
var
|
|
2628
|
+
var e_6, _d;
|
|
2643
2629
|
return __generator(this, function (_e) {
|
|
2644
2630
|
switch (_e.label) {
|
|
2645
2631
|
case 0:
|
|
@@ -2673,12 +2659,8 @@ var Database = /** @class */ (function (_super) {
|
|
|
2673
2659
|
})];
|
|
2674
2660
|
case 3:
|
|
2675
2661
|
_c = __read.apply(void 0, [_e.sent(), 2]), result_4 = _c[0], id = _c[1];
|
|
2676
|
-
if (this.$db.get('
|
|
2677
|
-
|
|
2678
|
-
table: this.$db.get('TABLE_NAME'),
|
|
2679
|
-
id: id
|
|
2680
|
-
});
|
|
2681
|
-
}
|
|
2662
|
+
if (this.$db.get('VOID'))
|
|
2663
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2682
2664
|
if (!result_4) return [3 /*break*/, 5];
|
|
2683
2665
|
sql_2 = [
|
|
2684
2666
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2701,6 +2683,8 @@ var Database = /** @class */ (function (_super) {
|
|
|
2701
2683
|
})];
|
|
2702
2684
|
case 7:
|
|
2703
2685
|
result_5 = _e.sent();
|
|
2686
|
+
if (this.$db.get('VOID'))
|
|
2687
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2704
2688
|
if (!result_5) return [3 /*break*/, 9];
|
|
2705
2689
|
return [4 /*yield*/, this._queryStatement([
|
|
2706
2690
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2717,12 +2701,12 @@ var Database = /** @class */ (function (_super) {
|
|
|
2717
2701
|
val.action_status = 'update';
|
|
2718
2702
|
}
|
|
2719
2703
|
}
|
|
2720
|
-
catch (
|
|
2704
|
+
catch (e_6_1) { e_6 = { error: e_6_1 }; }
|
|
2721
2705
|
finally {
|
|
2722
2706
|
try {
|
|
2723
2707
|
if (data_2_1 && !data_2_1.done && (_d = data_2.return)) _d.call(data_2);
|
|
2724
2708
|
}
|
|
2725
|
-
finally { if (
|
|
2709
|
+
finally { if (e_6) throw e_6.error; }
|
|
2726
2710
|
}
|
|
2727
2711
|
return [2 /*return*/, data || []];
|
|
2728
2712
|
}
|
|
@@ -2755,6 +2739,8 @@ var Database = /** @class */ (function (_super) {
|
|
|
2755
2739
|
})];
|
|
2756
2740
|
case 1:
|
|
2757
2741
|
result = _a.sent();
|
|
2742
|
+
if (this.$db.get('VOID'))
|
|
2743
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2758
2744
|
if (!result)
|
|
2759
2745
|
return [2 /*return*/, null];
|
|
2760
2746
|
sql = [
|
|
@@ -2793,7 +2779,7 @@ var Database = /** @class */ (function (_super) {
|
|
|
2793
2779
|
var _b = __read(_a, 2), column = _b[0], value = _b[1];
|
|
2794
2780
|
return "".concat(column, " = ").concat(value == null || value === 'NULL'
|
|
2795
2781
|
? 'NULL'
|
|
2796
|
-
: value.startsWith(_this.$constants('RAW'))
|
|
2782
|
+
: typeof value === 'string' && value.startsWith(_this.$constants('RAW'))
|
|
2797
2783
|
? "".concat(_this.$utils.covertBooleanToNumber(value)).replace(_this.$constants('RAW'), '')
|
|
2798
2784
|
: "'".concat(_this.$utils.covertBooleanToNumber(value), "'"));
|
|
2799
2785
|
});
|
|
@@ -2814,7 +2800,7 @@ var Database = /** @class */ (function (_super) {
|
|
|
2814
2800
|
].join(' ');
|
|
2815
2801
|
};
|
|
2816
2802
|
Database.prototype._queryInsertMultiple = function (data) {
|
|
2817
|
-
var
|
|
2803
|
+
var e_7, _a;
|
|
2818
2804
|
var _this = this;
|
|
2819
2805
|
var _b;
|
|
2820
2806
|
var values = [];
|
|
@@ -2824,17 +2810,19 @@ var Database = /** @class */ (function (_super) {
|
|
|
2824
2810
|
var vals = Object.values(objects).map(function (value) {
|
|
2825
2811
|
return "".concat(value == null || value === 'NULL'
|
|
2826
2812
|
? 'NULL'
|
|
2827
|
-
:
|
|
2813
|
+
: typeof value === 'string' && value.includes(_this.$constants('RAW'))
|
|
2814
|
+
? "".concat(_this.$utils.covertBooleanToNumber(value)).replace(_this.$constants('RAW'), '')
|
|
2815
|
+
: "'".concat(_this.$utils.covertBooleanToNumber(value), "'"));
|
|
2828
2816
|
});
|
|
2829
2817
|
values.push("(".concat(vals.join(','), ")"));
|
|
2830
2818
|
}
|
|
2831
2819
|
}
|
|
2832
|
-
catch (
|
|
2820
|
+
catch (e_7_1) { e_7 = { error: e_7_1 }; }
|
|
2833
2821
|
finally {
|
|
2834
2822
|
try {
|
|
2835
2823
|
if (data_3_1 && !data_3_1.done && (_a = data_3.return)) _a.call(data_3);
|
|
2836
2824
|
}
|
|
2837
|
-
finally { if (
|
|
2825
|
+
finally { if (e_7) throw e_7.error; }
|
|
2838
2826
|
}
|
|
2839
2827
|
var columns = Object.keys((_b = __spreadArray([], __read(data), false)) === null || _b === void 0 ? void 0 : _b.shift()).map(function (column) { return "`".concat(column, "`"); });
|
|
2840
2828
|
return [
|
|
@@ -2915,24 +2903,11 @@ var Database = /** @class */ (function (_super) {
|
|
|
2915
2903
|
this.$logger = this._setupLogger();
|
|
2916
2904
|
this.$utils = utils_1.default;
|
|
2917
2905
|
this.$constants = function (name) {
|
|
2918
|
-
var e_9, _a;
|
|
2919
2906
|
if (!name)
|
|
2920
|
-
return constants_1.
|
|
2921
|
-
|
|
2922
|
-
|
|
2923
|
-
|
|
2924
|
-
if (index === name.toLocaleUpperCase()) {
|
|
2925
|
-
return constant;
|
|
2926
|
-
}
|
|
2927
|
-
}
|
|
2928
|
-
}
|
|
2929
|
-
catch (e_9_1) { e_9 = { error: e_9_1 }; }
|
|
2930
|
-
finally {
|
|
2931
|
-
try {
|
|
2932
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
2933
|
-
}
|
|
2934
|
-
finally { if (e_9) throw e_9.error; }
|
|
2935
|
-
}
|
|
2907
|
+
return constants_1.CONSTANTS;
|
|
2908
|
+
if (!constants_1.CONSTANTS.hasOwnProperty(name.toUpperCase()))
|
|
2909
|
+
throw new Error("not found constants : ".concat(name));
|
|
2910
|
+
return constants_1.CONSTANTS[name.toUpperCase()];
|
|
2936
2911
|
};
|
|
2937
2912
|
};
|
|
2938
2913
|
return Database;
|
package/dist/lib/tspace/Model.js
CHANGED
|
@@ -1717,7 +1717,8 @@ var Model = /** @class */ (function (_super) {
|
|
|
1717
1717
|
break;
|
|
1718
1718
|
}
|
|
1719
1719
|
var filterSql = sql.filter(function (data) { return data !== '' || data == null; });
|
|
1720
|
-
|
|
1720
|
+
var query = filterSql.join(' ');
|
|
1721
|
+
return query;
|
|
1721
1722
|
};
|
|
1722
1723
|
Model.prototype._exceptColumns = function () {
|
|
1723
1724
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -2467,7 +2468,7 @@ var Model = /** @class */ (function (_super) {
|
|
|
2467
2468
|
var _b = __read(_a, 2), column = _b[0], value = _b[1];
|
|
2468
2469
|
return "".concat(column, " = ").concat(value == null || value === 'NULL'
|
|
2469
2470
|
? 'NULL'
|
|
2470
|
-
: value.
|
|
2471
|
+
: typeof value === 'string' && value.includes(_this.$constants('RAW'))
|
|
2471
2472
|
? "".concat(_this.$utils.covertBooleanToNumber(value)).replace(_this.$constants('RAW'), '')
|
|
2472
2473
|
: "'".concat(_this.$utils.covertBooleanToNumber(value), "'"));
|
|
2473
2474
|
});
|
|
@@ -2478,9 +2479,9 @@ var Model = /** @class */ (function (_super) {
|
|
|
2478
2479
|
var _this = this;
|
|
2479
2480
|
var hasTimestamp = this.$db.get('TIMESTAMP');
|
|
2480
2481
|
if (hasTimestamp) {
|
|
2481
|
-
var
|
|
2482
|
-
var createdAt = this._valuePattern(
|
|
2483
|
-
var updatedAt = this._valuePattern(
|
|
2482
|
+
var format_1 = this.$db.get('TIMESTAMP_FORMAT');
|
|
2483
|
+
var createdAt = this._valuePattern(format_1.CREATED_AT);
|
|
2484
|
+
var updatedAt = this._valuePattern(format_1.UPDATED_AT);
|
|
2484
2485
|
objects = __assign(__assign({}, objects), (_a = {}, _a[createdAt] = this.$utils.timestamp(), _a[updatedAt] = this.$utils.timestamp(), _a));
|
|
2485
2486
|
}
|
|
2486
2487
|
var hasUUID = objects.hasOwnProperty(this.$db.get('UUID_FORMAT'));
|
|
@@ -2489,10 +2490,12 @@ var Model = /** @class */ (function (_super) {
|
|
|
2489
2490
|
objects = __assign(__assign({}, objects), (_b = {}, _b[uuidFormat] = this.$utils.generateUUID(), _b));
|
|
2490
2491
|
}
|
|
2491
2492
|
var columns = Object.keys(objects).map(function (column) { return "`".concat(column, "`"); });
|
|
2492
|
-
var values = Object.values(objects).map(function (
|
|
2493
|
-
return "".concat(
|
|
2493
|
+
var values = Object.values(objects).map(function (value) {
|
|
2494
|
+
return "".concat(value == null || value === 'NULL'
|
|
2494
2495
|
? 'NULL'
|
|
2495
|
-
:
|
|
2496
|
+
: typeof value === 'string' && value.includes(_this.$constants('RAW'))
|
|
2497
|
+
? "".concat(_this.$utils.covertBooleanToNumber(value)).replace(_this.$constants('RAW'), '')
|
|
2498
|
+
: "'".concat(_this.$utils.covertBooleanToNumber(value), "'"));
|
|
2496
2499
|
});
|
|
2497
2500
|
return [
|
|
2498
2501
|
"(".concat(columns, ")"),
|
|
@@ -2511,9 +2514,9 @@ var Model = /** @class */ (function (_super) {
|
|
|
2511
2514
|
var objects = data_1_1.value;
|
|
2512
2515
|
var hasTimestamp = this.$db.get('TIMESTAMP');
|
|
2513
2516
|
if (hasTimestamp) {
|
|
2514
|
-
var
|
|
2515
|
-
var createdAt = this._valuePattern(
|
|
2516
|
-
var updatedAt = this._valuePattern(
|
|
2517
|
+
var format_2 = this.$db.get('TIMESTAMP_FORMAT');
|
|
2518
|
+
var createdAt = this._valuePattern(format_2.CREATED_AT);
|
|
2519
|
+
var updatedAt = this._valuePattern(format_2.UPDATED_AT);
|
|
2517
2520
|
objects = __assign(__assign({}, objects), (_b = {}, _b[createdAt] = this.$utils.timestamp(), _b[updatedAt] = this.$utils.timestamp(), _b));
|
|
2518
2521
|
columns = __spreadArray(__spreadArray([], __read(columns), false), [
|
|
2519
2522
|
"`".concat(createdAt, "`"),
|
|
@@ -2528,10 +2531,12 @@ var Model = /** @class */ (function (_super) {
|
|
|
2528
2531
|
"`".concat(uuidFormat, "`")
|
|
2529
2532
|
], false);
|
|
2530
2533
|
}
|
|
2531
|
-
var v = Object.values(objects).map(function (
|
|
2532
|
-
return "".concat(
|
|
2534
|
+
var v = Object.values(objects).map(function (value) {
|
|
2535
|
+
return "".concat(value == null || value === 'NULL'
|
|
2533
2536
|
? 'NULL'
|
|
2534
|
-
:
|
|
2537
|
+
: typeof value === 'string' && value.includes(_this.$constants('RAW'))
|
|
2538
|
+
? "".concat(_this.$utils.covertBooleanToNumber(value)).replace(_this.$constants('RAW'), '')
|
|
2539
|
+
: "'".concat(_this.$utils.covertBooleanToNumber(value), "'"));
|
|
2535
2540
|
});
|
|
2536
2541
|
values = __spreadArray(__spreadArray([], __read(values), false), [
|
|
2537
2542
|
"(".concat(v.join(','), ")")
|
|
@@ -2636,6 +2641,8 @@ var Model = /** @class */ (function (_super) {
|
|
|
2636
2641
|
})];
|
|
2637
2642
|
case 1:
|
|
2638
2643
|
_a = __read.apply(void 0, [_b.sent(), 2]), result = _a[0], id = _a[1];
|
|
2644
|
+
if (this.$db.get('VOID'))
|
|
2645
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2639
2646
|
if (!result) return [3 /*break*/, 3];
|
|
2640
2647
|
sql = [
|
|
2641
2648
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2665,6 +2672,8 @@ var Model = /** @class */ (function (_super) {
|
|
|
2665
2672
|
})];
|
|
2666
2673
|
case 1:
|
|
2667
2674
|
_a = __read.apply(void 0, [_b.sent(), 2]), result = _a[0], id = _a[1];
|
|
2675
|
+
if (this.$db.get('VOID'))
|
|
2676
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2668
2677
|
if (!result) return [3 /*break*/, 3];
|
|
2669
2678
|
arrayId = __spreadArray([], __read(Array(result)), false).map(function (_, i) { return i + id; });
|
|
2670
2679
|
sql = [
|
|
@@ -2721,6 +2730,8 @@ var Model = /** @class */ (function (_super) {
|
|
|
2721
2730
|
})];
|
|
2722
2731
|
case 3:
|
|
2723
2732
|
_c = __read.apply(void 0, [_e.sent(), 2]), result_6 = _c[0], id = _c[1];
|
|
2733
|
+
if (this.$db.get('VOID'))
|
|
2734
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2724
2735
|
if (!result_6) return [3 /*break*/, 5];
|
|
2725
2736
|
sql_5 = [
|
|
2726
2737
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2743,6 +2754,8 @@ var Model = /** @class */ (function (_super) {
|
|
|
2743
2754
|
})];
|
|
2744
2755
|
case 7:
|
|
2745
2756
|
result_7 = _e.sent();
|
|
2757
|
+
if (this.$db.get('VOID'))
|
|
2758
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2746
2759
|
if (!result_7) return [3 /*break*/, 9];
|
|
2747
2760
|
return [4 /*yield*/, this._queryStatementModel([
|
|
2748
2761
|
"".concat(this.$db.get('SELECT')),
|
|
@@ -2794,6 +2807,8 @@ var Model = /** @class */ (function (_super) {
|
|
|
2794
2807
|
].join(' '), returnId: true })];
|
|
2795
2808
|
case 1:
|
|
2796
2809
|
_a = __read.apply(void 0, [_b.sent(), 1]), result = _a[0];
|
|
2810
|
+
if (this.$db.get('VOID'))
|
|
2811
|
+
return [2 /*return*/, Promise.resolve()];
|
|
2797
2812
|
if (!result)
|
|
2798
2813
|
return [2 /*return*/, null];
|
|
2799
2814
|
return [4 /*yield*/, this._queryStatementModel([
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tspace-mysql",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "mysql query builder object relational mapping",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"types": "dist/lib/index.d.ts",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"tspace",
|
|
20
20
|
"tspace-mysql",
|
|
21
21
|
"orm",
|
|
22
|
-
"object relation model",
|
|
22
|
+
"object relation model",
|
|
23
23
|
"model",
|
|
24
24
|
"database",
|
|
25
25
|
"query builder",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"url": "https://github.com/thanathip41/tspace-mysql"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"dotenv": "^
|
|
40
|
+
"dotenv": "^16.0.3",
|
|
41
41
|
"mysql": "^2.18.1",
|
|
42
42
|
"pluralize": "^8.0.0",
|
|
43
43
|
"sql-formatter": "^10.7.1"
|