@rdyl/node-mysql 0.2.8 → 0.3.0
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 +13 -6
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
package/dist/helper.js
CHANGED
|
@@ -99,13 +99,20 @@ var BaseHelper = /** @class */ (function () {
|
|
|
99
99
|
var item = _this.related[n];
|
|
100
100
|
// @ts-ignore
|
|
101
101
|
var _a = (global.$MysqlTable[item.table] || {}).fields, fields = _a === void 0 ? [] : _a;
|
|
102
|
-
|
|
103
|
-
.
|
|
104
|
-
|
|
102
|
+
if (item.isArray) {
|
|
103
|
+
sqlList.push("COALESCE(\n (\n SELECT JSON_ARRAYAGG(\n JSON_OBJECT(".concat(fields
|
|
104
|
+
.map(function (e) { return "".concat(e, ": ").concat(item.table, ".").concat(e); })
|
|
105
|
+
.join(","), ")\n )\n FROM ").concat(item.relatedTable, "\n JOIN ").concat(item.table, " ON ").concat(item.table, ".id = ").concat(item.relatedTable, ".").concat(item.table, "_id\n WHERE ").concat(item.relatedTable, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n LIMIT 1\n ),\n JSON_ARRAY()\n) AS ").concat(item.table));
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
sqlList.push("COALESCE(\n (\n SELECT JSON_OBJECT(".concat(fields
|
|
109
|
+
.map(function (e) { return "".concat(e, ": ").concat(item.table, ".").concat(e); })
|
|
110
|
+
.join(","), ")\n FROM ").concat(item.relatedTable, "\n JOIN ").concat(item.table, " ON ").concat(item.table, ".id = ").concat(item.relatedTable, ".").concat(item.table, "_id\n WHERE ").concat(item.relatedTable, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n LIMIT 1\n ),\n JSON_OBJECT()\n) AS role,\n"));
|
|
111
|
+
}
|
|
105
112
|
});
|
|
106
113
|
}
|
|
107
114
|
return {
|
|
108
|
-
sql: sqlList.join("
|
|
115
|
+
sql: sqlList.length > 0 ? "\n" : "" + sqlList.join("\n"),
|
|
109
116
|
};
|
|
110
117
|
},
|
|
111
118
|
enumerable: false,
|
|
@@ -191,8 +198,8 @@ var MysqlSelector = /** @class */ (function (_super) {
|
|
|
191
198
|
}
|
|
192
199
|
Object.defineProperty(MysqlSelector.prototype, "sql", {
|
|
193
200
|
get: function () {
|
|
194
|
-
var _a = this, selectStat = _a.selectStat, optionStat = _a.optionStat;
|
|
195
|
-
var target = "SELECT * FROM ".concat(this.table);
|
|
201
|
+
var _a = this, selectStat = _a.selectStat, optionStat = _a.optionStat, relatedStat = _a.relatedStat;
|
|
202
|
+
var target = "SELECT * ".concat(relatedStat.sql, "FROM ").concat(this.table);
|
|
196
203
|
if (selectStat.sql) {
|
|
197
204
|
target += selectStat.sql;
|
|
198
205
|
}
|