@rdyl/node-mysql 0.0.6 → 0.0.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/CHANGELOG.md +1 -1
- package/dist/helper.js +31 -33
- package/dist/meta.js +13 -13
- package/package.json +1 -1
- package/types/helper.d.ts +1 -1
- package/types/meta.d.ts +4 -4
- package/types/type.d.ts +2 -2
package/CHANGELOG.md
CHANGED
package/dist/helper.js
CHANGED
|
@@ -86,19 +86,19 @@ var BaseHelper = /** @class */ (function () {
|
|
|
86
86
|
}
|
|
87
87
|
Object.defineProperty(BaseHelper.prototype, "selectStat", {
|
|
88
88
|
get: function () {
|
|
89
|
-
var sql =
|
|
89
|
+
var sql = "";
|
|
90
90
|
var selects = this.selects;
|
|
91
91
|
var values = [];
|
|
92
92
|
if (selects.length > 0) {
|
|
93
|
-
sql +=
|
|
93
|
+
sql += " WHERE ";
|
|
94
94
|
selects.forEach(function (ele, i) {
|
|
95
|
-
var field = ele.field, value = ele.value, _a = ele.condition, condition = _a === void 0 ?
|
|
95
|
+
var field = ele.field, value = ele.value, _a = ele.condition, condition = _a === void 0 ? "eq" : _a, _b = ele.relation, relation = _b === void 0 ? "and" : _b;
|
|
96
96
|
var res = "".concat(utils_1.Parser.toDbName(field), " ").concat(interface_1.ConditionMaps[condition], " ");
|
|
97
|
-
if (condition ===
|
|
98
|
-
res +=
|
|
97
|
+
if (condition === "include") {
|
|
98
|
+
res += "(?)";
|
|
99
99
|
}
|
|
100
100
|
else {
|
|
101
|
-
res +=
|
|
101
|
+
res += "?";
|
|
102
102
|
}
|
|
103
103
|
if (i > 0) {
|
|
104
104
|
sql += " ".concat(relation, " ").concat(res);
|
|
@@ -120,13 +120,13 @@ var BaseHelper = /** @class */ (function () {
|
|
|
120
120
|
Object.defineProperty(BaseHelper.prototype, "optionStat", {
|
|
121
121
|
get: function () {
|
|
122
122
|
var _a = this.options, _b = _a.limit, limit = _b === void 0 ? 0 : _b, _c = _a.skip, skip = _c === void 0 ? 0 : _c, sort = _a.sort;
|
|
123
|
-
var sql =
|
|
123
|
+
var sql = "";
|
|
124
124
|
if (Object.keys(sort).length > 0) {
|
|
125
125
|
var items_1 = [];
|
|
126
126
|
Object.keys(sort).forEach(function (name) {
|
|
127
127
|
items_1.push("".concat(utils_1.Parser.toDbName(name), " ").concat(interface_1.SortMaps[sort[name]]));
|
|
128
128
|
});
|
|
129
|
-
sql += "ORDER BY ".concat(items_1.join(
|
|
129
|
+
sql += "ORDER BY ".concat(items_1.join("), "));
|
|
130
130
|
}
|
|
131
131
|
if (limit > 0) {
|
|
132
132
|
sql += "\nLIMIT ".concat(limit, " OFFSET ").concat(skip);
|
|
@@ -175,7 +175,7 @@ var MysqlSelector = /** @class */ (function (_super) {
|
|
|
175
175
|
if (optionStat.sql) {
|
|
176
176
|
target += optionStat.sql;
|
|
177
177
|
}
|
|
178
|
-
return target +
|
|
178
|
+
return target + ";";
|
|
179
179
|
},
|
|
180
180
|
enumerable: false,
|
|
181
181
|
configurable: true
|
|
@@ -187,7 +187,7 @@ var MysqlSelector = /** @class */ (function (_super) {
|
|
|
187
187
|
if (selectStat.sql) {
|
|
188
188
|
target += selectStat.sql;
|
|
189
189
|
}
|
|
190
|
-
return target +
|
|
190
|
+
return target + ";";
|
|
191
191
|
},
|
|
192
192
|
enumerable: false,
|
|
193
193
|
configurable: true
|
|
@@ -216,16 +216,15 @@ var MysqlSelector = /** @class */ (function (_super) {
|
|
|
216
216
|
/** @查询结果 */
|
|
217
217
|
MysqlSelector.prototype.result = function () {
|
|
218
218
|
return __awaiter(this, void 0, void 0, function () {
|
|
219
|
-
var _a, selectStat, sql, res, exFields_1, get,
|
|
220
|
-
return __generator(this, function (
|
|
221
|
-
switch (
|
|
219
|
+
var _a, selectStat, sql, res, exFields_1, get, _b;
|
|
220
|
+
return __generator(this, function (_c) {
|
|
221
|
+
switch (_c.label) {
|
|
222
222
|
case 0:
|
|
223
|
-
|
|
223
|
+
_c.trys.push([0, 2, , 3]);
|
|
224
224
|
_a = this, selectStat = _a.selectStat, sql = _a.sql;
|
|
225
225
|
return [4 /*yield*/, global.mysqlPool.execute(sql, selectStat.values)];
|
|
226
226
|
case 1:
|
|
227
|
-
res = (
|
|
228
|
-
console.log(res);
|
|
227
|
+
res = (_c.sent())[0];
|
|
229
228
|
exFields_1 = this.exFields;
|
|
230
229
|
get = function (obj) {
|
|
231
230
|
return Object.fromEntries(
|
|
@@ -240,8 +239,7 @@ var MysqlSelector = /** @class */ (function (_super) {
|
|
|
240
239
|
}
|
|
241
240
|
return [2 /*return*/, [get(res)]];
|
|
242
241
|
case 2:
|
|
243
|
-
|
|
244
|
-
console.log(err_1);
|
|
242
|
+
_b = _c.sent();
|
|
245
243
|
return [2 /*return*/, []];
|
|
246
244
|
case 3: return [2 /*return*/];
|
|
247
245
|
}
|
|
@@ -256,7 +254,7 @@ var MysqlSelector = /** @class */ (function (_super) {
|
|
|
256
254
|
switch (_a.label) {
|
|
257
255
|
case 0:
|
|
258
256
|
this.select({
|
|
259
|
-
field:
|
|
257
|
+
field: "id",
|
|
260
258
|
value: value,
|
|
261
259
|
});
|
|
262
260
|
return [4 /*yield*/, this.result()];
|
|
@@ -305,14 +303,14 @@ var MysqlInserter = /** @class */ (function (_super) {
|
|
|
305
303
|
if (fields === void 0) { fields = []; }
|
|
306
304
|
var _this = _super.call(this, t) || this;
|
|
307
305
|
_this.values = [];
|
|
308
|
-
_this.fields = fields.filter(function (e) { return e !==
|
|
306
|
+
_this.fields = fields.filter(function (e) { return e !== "id"; });
|
|
309
307
|
return _this;
|
|
310
308
|
}
|
|
311
309
|
Object.defineProperty(MysqlInserter.prototype, "sql", {
|
|
312
310
|
get: function () {
|
|
313
311
|
return "INSERT INTO ".concat(this._tableName, " (").concat(this.fields
|
|
314
312
|
.map(utils_1.Parser.toDbName)
|
|
315
|
-
.join(
|
|
313
|
+
.join(", "), ") \nVALUES (").concat(this.fields.map(function () { return "?"; }).join(", "), ")");
|
|
316
314
|
},
|
|
317
315
|
enumerable: false,
|
|
318
316
|
configurable: true
|
|
@@ -385,7 +383,7 @@ var MysqlDeleter = /** @class */ (function (_super) {
|
|
|
385
383
|
if (optionStat.sql) {
|
|
386
384
|
target += optionStat.sql;
|
|
387
385
|
}
|
|
388
|
-
return target +
|
|
386
|
+
return target + ";";
|
|
389
387
|
},
|
|
390
388
|
enumerable: false,
|
|
391
389
|
configurable: true
|
|
@@ -393,7 +391,7 @@ var MysqlDeleter = /** @class */ (function (_super) {
|
|
|
393
391
|
/** @查询结果 */
|
|
394
392
|
MysqlDeleter.prototype.result = function () {
|
|
395
393
|
return __awaiter(this, void 0, void 0, function () {
|
|
396
|
-
var _a, sql, selectStat, res,
|
|
394
|
+
var _a, sql, selectStat, res, err_1;
|
|
397
395
|
return __generator(this, function (_b) {
|
|
398
396
|
switch (_b.label) {
|
|
399
397
|
case 0:
|
|
@@ -405,7 +403,7 @@ var MysqlDeleter = /** @class */ (function (_super) {
|
|
|
405
403
|
// @ts-ignore
|
|
406
404
|
return [2 /*return*/, res.affectedRows];
|
|
407
405
|
case 2:
|
|
408
|
-
|
|
406
|
+
err_1 = _b.sent();
|
|
409
407
|
return [2 /*return*/, 0];
|
|
410
408
|
case 3: return [2 /*return*/];
|
|
411
409
|
}
|
|
@@ -420,16 +418,16 @@ var MysqlDeleter = /** @class */ (function (_super) {
|
|
|
420
418
|
switch (_a.label) {
|
|
421
419
|
case 0:
|
|
422
420
|
this.select({
|
|
423
|
-
field:
|
|
421
|
+
field: "id",
|
|
424
422
|
value: value,
|
|
425
423
|
});
|
|
426
424
|
return [4 /*yield*/, this.result()];
|
|
427
425
|
case 1:
|
|
428
426
|
count = _a.sent();
|
|
429
427
|
if (count > 0) {
|
|
430
|
-
return [2 /*return*/,
|
|
428
|
+
return [2 /*return*/, "ok"];
|
|
431
429
|
}
|
|
432
|
-
return [2 /*return*/,
|
|
430
|
+
return [2 /*return*/, "fail"];
|
|
433
431
|
}
|
|
434
432
|
});
|
|
435
433
|
});
|
|
@@ -450,11 +448,11 @@ var MysqlUpdater = /** @class */ (function (_super) {
|
|
|
450
448
|
Object.defineProperty(MysqlUpdater.prototype, "updateStat", {
|
|
451
449
|
get: function () {
|
|
452
450
|
var _a = this, updateFields = _a.updateFields, exFields = _a.exFields;
|
|
453
|
-
var keys = Object.keys(updateFields).filter(function (k) { return k !==
|
|
454
|
-
var sql =
|
|
451
|
+
var keys = Object.keys(updateFields).filter(function (k) { return k !== "id" && !exFields.includes(k); });
|
|
452
|
+
var sql = "";
|
|
455
453
|
var values = [];
|
|
456
454
|
if (keys.length > 0) {
|
|
457
|
-
sql +=
|
|
455
|
+
sql += " SET ";
|
|
458
456
|
keys.map(function (field) {
|
|
459
457
|
sql += "".concat(utils_1.Parser.toDbName(field), " = ? ");
|
|
460
458
|
values.push(updateFields[field]);
|
|
@@ -479,7 +477,7 @@ var MysqlUpdater = /** @class */ (function (_super) {
|
|
|
479
477
|
if (optionStat.sql) {
|
|
480
478
|
target += optionStat.sql;
|
|
481
479
|
}
|
|
482
|
-
return target +
|
|
480
|
+
return target + ";";
|
|
483
481
|
},
|
|
484
482
|
enumerable: false,
|
|
485
483
|
configurable: true
|
|
@@ -495,7 +493,7 @@ var MysqlUpdater = /** @class */ (function (_super) {
|
|
|
495
493
|
/** @查询结果 */
|
|
496
494
|
MysqlUpdater.prototype.result = function () {
|
|
497
495
|
return __awaiter(this, void 0, void 0, function () {
|
|
498
|
-
var _a, sql, selectStat, updateStat, values, res,
|
|
496
|
+
var _a, sql, selectStat, updateStat, values, res, err_2;
|
|
499
497
|
return __generator(this, function (_b) {
|
|
500
498
|
switch (_b.label) {
|
|
501
499
|
case 0:
|
|
@@ -507,7 +505,7 @@ var MysqlUpdater = /** @class */ (function (_super) {
|
|
|
507
505
|
res = (_b.sent())[0];
|
|
508
506
|
return [2 /*return*/, res.affectedRows];
|
|
509
507
|
case 2:
|
|
510
|
-
|
|
508
|
+
err_2 = _b.sent();
|
|
511
509
|
return [2 /*return*/, 0];
|
|
512
510
|
case 3: return [2 /*return*/];
|
|
513
511
|
}
|
package/dist/meta.js
CHANGED
|
@@ -36,15 +36,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.
|
|
39
|
+
exports.MysqlDbSchema = void 0;
|
|
40
40
|
var helper_1 = require("./helper");
|
|
41
41
|
var utils_1 = require("./utils");
|
|
42
42
|
/**
|
|
43
43
|
* @description
|
|
44
44
|
* 使用$toMap时 不返回的字段名前面需要加$
|
|
45
45
|
*/
|
|
46
|
-
var
|
|
47
|
-
function
|
|
46
|
+
var MysqlDbSchema = /** @class */ (function () {
|
|
47
|
+
function MysqlDbSchema($table, $mapExFields) {
|
|
48
48
|
if ($mapExFields === void 0) { $mapExFields = []; }
|
|
49
49
|
this.$table = $table;
|
|
50
50
|
this.$mapExFields = $mapExFields;
|
|
@@ -52,7 +52,7 @@ var DbSchema = /** @class */ (function () {
|
|
|
52
52
|
this.createTime = utils_1.Parser.easyDate();
|
|
53
53
|
this.updateTime = utils_1.Parser.easyDate();
|
|
54
54
|
}
|
|
55
|
-
Object.defineProperty(
|
|
55
|
+
Object.defineProperty(MysqlDbSchema.prototype, "$toJson", {
|
|
56
56
|
get: function () {
|
|
57
57
|
var _this = this;
|
|
58
58
|
return Object.keys(this).reduce(function (obj, key) {
|
|
@@ -67,7 +67,7 @@ var DbSchema = /** @class */ (function () {
|
|
|
67
67
|
enumerable: false,
|
|
68
68
|
configurable: true
|
|
69
69
|
});
|
|
70
|
-
Object.defineProperty(
|
|
70
|
+
Object.defineProperty(MysqlDbSchema.prototype, "$toMap", {
|
|
71
71
|
get: function () {
|
|
72
72
|
var _this = this;
|
|
73
73
|
var target = this.$toJson;
|
|
@@ -80,14 +80,14 @@ var DbSchema = /** @class */ (function () {
|
|
|
80
80
|
enumerable: false,
|
|
81
81
|
configurable: true
|
|
82
82
|
});
|
|
83
|
-
Object.defineProperty(
|
|
83
|
+
Object.defineProperty(MysqlDbSchema.prototype, "$fields", {
|
|
84
84
|
get: function () {
|
|
85
85
|
return Object.keys(this.$toJson);
|
|
86
86
|
},
|
|
87
87
|
enumerable: false,
|
|
88
88
|
configurable: true
|
|
89
89
|
});
|
|
90
|
-
|
|
90
|
+
MysqlDbSchema.prototype.$formJson = function (json) {
|
|
91
91
|
var _this = this;
|
|
92
92
|
Object.keys(json).forEach(function (k) {
|
|
93
93
|
if (Object.prototype.hasOwnProperty.call(_this, k)) {
|
|
@@ -96,7 +96,7 @@ var DbSchema = /** @class */ (function () {
|
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
98
|
};
|
|
99
|
-
|
|
99
|
+
MysqlDbSchema.prototype.$get = function () {
|
|
100
100
|
return __awaiter(this, void 0, void 0, function () {
|
|
101
101
|
var selector, res;
|
|
102
102
|
return __generator(this, function (_a) {
|
|
@@ -115,7 +115,7 @@ var DbSchema = /** @class */ (function () {
|
|
|
115
115
|
});
|
|
116
116
|
});
|
|
117
117
|
};
|
|
118
|
-
|
|
118
|
+
MysqlDbSchema.prototype.$insert = function (uniqueKey) {
|
|
119
119
|
return __awaiter(this, void 0, void 0, function () {
|
|
120
120
|
var inserter, existing, res;
|
|
121
121
|
return __generator(this, function (_a) {
|
|
@@ -147,7 +147,7 @@ var DbSchema = /** @class */ (function () {
|
|
|
147
147
|
});
|
|
148
148
|
});
|
|
149
149
|
};
|
|
150
|
-
|
|
150
|
+
MysqlDbSchema.prototype.$remove = function () {
|
|
151
151
|
return __awaiter(this, void 0, void 0, function () {
|
|
152
152
|
var deleter, user;
|
|
153
153
|
return __generator(this, function (_a) {
|
|
@@ -165,7 +165,7 @@ var DbSchema = /** @class */ (function () {
|
|
|
165
165
|
});
|
|
166
166
|
});
|
|
167
167
|
};
|
|
168
|
-
|
|
168
|
+
MysqlDbSchema.prototype.$update = function (maps) {
|
|
169
169
|
return __awaiter(this, void 0, void 0, function () {
|
|
170
170
|
var updater, user, values, affected;
|
|
171
171
|
return __generator(this, function (_a) {
|
|
@@ -196,6 +196,6 @@ var DbSchema = /** @class */ (function () {
|
|
|
196
196
|
});
|
|
197
197
|
});
|
|
198
198
|
};
|
|
199
|
-
return
|
|
199
|
+
return MysqlDbSchema;
|
|
200
200
|
}());
|
|
201
|
-
exports.
|
|
201
|
+
exports.MysqlDbSchema = MysqlDbSchema;
|
package/package.json
CHANGED
package/types/helper.d.ts
CHANGED
package/types/meta.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @description
|
|
3
3
|
* 使用$toMap时 不返回的字段名前面需要加$
|
|
4
4
|
*/
|
|
5
|
-
export declare class
|
|
5
|
+
export declare class MysqlDbSchema implements MysqlDbBaseType {
|
|
6
6
|
$table: string;
|
|
7
7
|
$mapExFields: string[];
|
|
8
8
|
id: number | string;
|
|
@@ -16,7 +16,7 @@ export declare class DbSchema implements DbBaseType {
|
|
|
16
16
|
get $fields(): string[];
|
|
17
17
|
$formJson(json: Record<string, unknown>): void;
|
|
18
18
|
$get(): Promise<this | null>;
|
|
19
|
-
$insert(uniqueKey?: string): Promise<
|
|
20
|
-
$remove(): Promise<
|
|
21
|
-
$update(maps: Record<string, unknown>): Promise<
|
|
19
|
+
$insert(uniqueKey?: string): Promise<MysqlDbResultStat>;
|
|
20
|
+
$remove(): Promise<MysqlDbResultStat>;
|
|
21
|
+
$update(maps: Record<string, unknown>): Promise<MysqlDbResultStat>;
|
|
22
22
|
}
|
package/types/type.d.ts
CHANGED