@rdyl/node-mysql 0.3.9 → 0.4.1

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.3.8 (2025-12-31)
+# 0.4.0 (2026-01-04)
 
 
 

package/dist/helper.js

@@ -74,6 +74,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlUpdater = exports.MysqlDeleter = exports.MysqlInserter = exports.MysqlSelector = void 0;
 var interface_1 = require("./interface");
 var utils_1 = require("./utils");
+var toDbName = utils_1.Parser.toDbName;
 var BaseHelper = /** @class */ (function () {
     function BaseHelper(table, related) {
         if (related === void 0) { related = {}; }
@@ -97,17 +98,18 @@ var BaseHelper = /** @class */ (function () {
                 /* 单个角色对象 */
                 relatedFields.forEach(function (n) {
                     var item = _this.related[n];
-                    var model = item.model;
-                    var fields = model.$mapFields;
-                    var rTable = model.$table;
+                    var related = item.related, ownerId = item.ownerId, instance = item.instance, isArray = item.isArray;
+                    var relatedId = "".concat(n, "Id");
+                    var fields = instance.$mapFields;
+                    var iTable = instance.$table;
                     var fieldsSql = "\n".concat(fields
-                        .map(function (e) { return "      '".concat(e, "', ").concat(rTable, ".").concat(utils_1.Parser.toDbName(e)); })
+                        .map(function (e) { return "      '".concat(e, "', ").concat(iTable, ".").concat(toDbName(e)); })
                         .join(",\n"), "\n");
-                    if (item.isArray) {
-                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_ARRAYAGG(\n      JSON_OBJECT(".concat(fieldsSql, "    )\n    )\n    FROM ").concat(item.related, "\n    JOIN ").concat(rTable, " ON ").concat(rTable, ".id = ").concat(item.related, ".").concat(rTable, "_id\n    WHERE ").concat(item.related, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n  ),\n  JSON_ARRAY()\n) AS ").concat(n, "\n"));
+                    if (isArray) {
+                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_ARRAYAGG(\n      JSON_OBJECT(".concat(fieldsSql, "    )\n    )\n    FROM ").concat(related, "\n    JOIN ").concat(iTable, " ON ").concat(iTable, ".id = ").concat(related, ".").concat(toDbName(relatedId), "\n    WHERE ").concat(related, ".").concat(toDbName(ownerId), " = ").concat(_this.table, ".id\n  ),\n  JSON_ARRAY()\n) AS ").concat(n, "\n"));
                     }
                     else {
-                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_OBJECT(".concat(fieldsSql, "    )\n    FROM ").concat(item.related, "\n    JOIN ").concat(rTable, " ON ").concat(rTable, ".id = ").concat(item.related, ".").concat(rTable, "_id\n    WHERE ").concat(item.related, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n    LIMIT 1\n  ),\n  JSON_OBJECT()\n) AS ").concat(n, "\n"));
+                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_OBJECT(".concat(fieldsSql, "    )\n    FROM ").concat(related, "\n    JOIN ").concat(iTable, " ON ").concat(iTable, ".id = ").concat(related, ".").concat(toDbName(relatedId), "\n    WHERE ").concat(related, ".").concat(toDbName(ownerId), " = ").concat(_this.table, ".id\n    LIMIT 1\n  )\n) AS ").concat(n, "\n"));
                     }
                 });
             }
@@ -127,7 +129,7 @@ var BaseHelper = /** @class */ (function () {
                 sql += " WHERE ";
                 selects.forEach(function (ele, i) {
                     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;
-                    var res = "".concat(utils_1.Parser.toDbName(field), " ").concat(interface_1.ConditionMaps[condition], " ");
+                    var res = "".concat(toDbName(field), " ").concat(interface_1.ConditionMaps[condition], " ");
                     if (condition === "include") {
                         res += "(?)";
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/node-mysql",
-  "version": "0.3.9",
+  "version": "0.4.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/type.d.ts

@@ -9,7 +9,8 @@ interface MysqlDbBaseType {
 type MysqlDbResultStat = "exist" | "ok" | "fail";
 
 type MysqlRelatedField = {
-  model: import("./meta").MysqlDbSchema;
-  related: string;
+  instance: import("./meta").MysqlDbSchema;
+  related:string
+  ownerId: string
   isArray?: boolean;
 };