befly 3.9.40 → 3.10.1

package/tests/dbHelper-batch-write.test.ts

@@ -0,0 +1,90 @@
+import { describe, expect, it, mock } from "bun:test";
+
+import { MySqlDialect } from "../lib/dbDialect.js";
+import { DbHelper } from "../lib/dbHelper.js";
+
+function createRedisMock() {
+    return {
+        getObject: async () => null,
+        setObject: async () => "OK",
+        genTimeID: async () => 1
+    };
+}
+
+describe("DbHelper - batch write helpers", () => {
+    it("delForceBatch: 空数组直接返回 0 且不执行 SQL", async () => {
+        const sqlMock = {
+            unsafe: mock(() => Promise.resolve({ changes: 0 }))
+        };
+
+        const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
+
+        const changes = await (dbHelper as any).delForceBatch("addon_admin_api", []);
+
+        expect(changes).toBe(0);
+        expect(sqlMock.unsafe).toHaveBeenCalledTimes(0);
+    });
+
+    it("delForceBatch: 生成单条 DELETE ... IN 并执行一次", async () => {
+        const sqlMock = {
+            unsafe: mock(() => Promise.resolve({ changes: 2 }))
+        };
+
+        const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
+
+        const changes = await (dbHelper as any).delForceBatch("addon_admin_api", [1, 2]);
+
+        expect(changes).toBe(2);
+        expect(sqlMock.unsafe).toHaveBeenCalledTimes(1);
+
+        const call = (sqlMock.unsafe as any).mock.calls[0];
+        expect(call[0]).toBe("DELETE FROM `addon_admin_api` WHERE `id` IN (?,?)");
+        expect(call[1]).toEqual([1, 2]);
+    });
+
+    it("updBatch: 空数组直接返回 0 且不执行 SQL", async () => {
+        const sqlMock = {
+            unsafe: mock(() => Promise.resolve({ changes: 0 }))
+        };
+
+        const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
+
+        const changes = await (dbHelper as any).updBatch("addon_admin_api", []);
+
+        expect(changes).toBe(0);
+        expect(sqlMock.unsafe).toHaveBeenCalledTimes(0);
+    });
+
+    it("updBatch: 生成单条 UPDATE + CASE 并执行一次", async () => {
+        const sqlMock = {
+            unsafe: mock(() => Promise.resolve({ changes: 2 }))
+        };
+
+        const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
+
+        const changes = await (dbHelper as any).updBatch("addon_admin_api", [
+            { id: 1, data: { name: "A", routePath: "/api/a", addonName: "x" } },
+            { id: 2, data: { name: "B", routePath: "/api/b", addonName: "y" } }
+        ]);
+
+        expect(changes).toBe(2);
+        expect(sqlMock.unsafe).toHaveBeenCalledTimes(1);
+
+        const call = (sqlMock.unsafe as any).mock.calls[0];
+        const sql = String(call[0]);
+        const params = call[1] as any[];
+
+        expect(sql.startsWith("UPDATE `addon_admin_api` SET")).toBe(true);
+        expect(sql.includes("`name` = CASE `id`")).toBe(true);
+        expect(sql.includes("`route_path` = CASE `id`")).toBe(true);
+        expect(sql.includes("`addon_name` = CASE `id`")).toBe(true);
+        expect(sql.includes("`updated_at` = ?")).toBe(true);
+        expect(sql.endsWith("WHERE `id` IN (?,?) AND `state` > 0")).toBe(true);
+
+        // 参数数量应包含：每个字段 2 行 * (id,value) *3字段 => 12，+ updated_at 1，+ where ids 2 => 15
+        expect(params.length).toBe(15);
+        // 末尾两个参数是 where ids
+        expect(params[params.length - 2]).toBe(1);
+        expect(params[params.length - 1]).toBe(2);
+    });
+});

package/tests/dbHelper-columns.test.ts

@@ -6,17 +6,20 @@
 import { test, expect, mock } from "bun:test";
 
 import { CacheKeys } from "../lib/cacheKeys.js";
+import { MySqlDialect } from "../lib/dbDialect.js";
 import { DbHelper } from "../lib/dbHelper.js";
 
-// 创建 Mock Befly 上下文
-function createMockBefly(sqlMock: any, redisMock?: any) {
+function createRedisMock(options?: { getObject?: any; setObject?: any; del?: any; genTimeID?: any }) {
+    const getObject = options?.getObject ? options.getObject : mock(async () => null);
+    const setObject = options?.setObject ? options.setObject : mock(async () => true);
+    const del = options?.del ? options.del : mock(async () => 1);
+    const genTimeID = options?.genTimeID ? options.genTimeID : mock(async () => 1);
+
     return {
-        redis: redisMock || {
-            getObject: mock(async () => null),
-            setObject: mock(async () => true),
-            del: mock(async () => 1)
-        },
-        db: null
+        getObject: getObject,
+        setObject: setObject,
+        del: del,
+        genTimeID: genTimeID
     };
 }
 
@@ -31,14 +34,11 @@ test("getTableColumns - 正常查询表字段", async () => {
         })
     };
 
-    const redisMock = {
-        getObject: mock(async () => null), // 缓存未命中
-        setObject: mock(async () => true),
-        del: mock(async () => 1)
-    };
+    const redisMock = createRedisMock({
+        getObject: mock(async () => null) // 缓存未命中
+    });
 
-    const befly = createMockBefly(sqlMock, redisMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: redisMock as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const columns = await (dbHelper as any).getTableColumns("users");
 
@@ -50,11 +50,9 @@ test("getTableColumns - 正常查询表字段", async () => {
 
 test("getTableColumns - Redis 缓存命中", async () => {
     const cachedColumns = ["id", "name", "email"];
-    const redisMock = {
-        getObject: mock(async () => cachedColumns),
-        setObject: mock(async () => true),
-        del: mock(async () => 1)
-    };
+    const redisMock = createRedisMock({
+        getObject: mock(async () => cachedColumns)
+    });
 
     const sqlMock = {
         unsafe: mock(async () => {
@@ -62,8 +60,7 @@ test("getTableColumns - Redis 缓存命中", async () => {
         })
     };
 
-    const befly = createMockBefly(sqlMock, redisMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: redisMock as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const columns = await (dbHelper as any).getTableColumns("users");
 
@@ -78,14 +75,9 @@ test("getTableColumns - 表不存在错误", async () => {
         unsafe: mock(async () => []) // 返回空结果
     };
 
-    const redisMock = {
-        getObject: mock(async () => null),
-        setObject: mock(async () => true),
-        del: mock(async () => 1)
-    };
+    const redisMock = createRedisMock();
 
-    const befly = createMockBefly(sqlMock, redisMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: redisMock as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     try {
         await (dbHelper as any).getTableColumns("non_existent_table");
@@ -106,8 +98,7 @@ test("getTableColumns - SQL 语法使用反引号", async () => {
         })
     };
 
-    const befly = createMockBefly(sqlMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     await (dbHelper as any).getTableColumns("addon_admin_user");
 
@@ -123,8 +114,7 @@ test("getTableColumns - 表名特殊字符处理", async () => {
         unsafe: mock(async () => mockColumns)
     };
 
-    const befly = createMockBefly(sqlMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     // 测试下划线表名
     await (dbHelper as any).getTableColumns("addon_admin_user");
@@ -141,7 +131,7 @@ test("getTableColumns - 缓存键格式正确", async () => {
         unsafe: mock(async () => mockColumns)
     };
 
-    const redisMock = {
+    const redisMock = createRedisMock({
         getObject: mock(async () => null),
         setObject: mock(async (key: string, value: any, seconds: number) => {
             // 验证缓存键格式
@@ -151,12 +141,10 @@ test("getTableColumns - 缓存键格式正确", async () => {
             // 验证过期时间
             expect(seconds).toBe(3600); // 1 小时
             return true;
-        }),
-        del: mock(async () => 1)
-    };
+        })
+    });
 
-    const befly = createMockBefly(sqlMock, redisMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: redisMock as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     await (dbHelper as any).getTableColumns("test_table");
 
@@ -175,17 +163,15 @@ test("getTableColumns - 多次调用相同表（缓存效果）", async () => {
     };
 
     const cache: Record<string, any> = {};
-    const redisMock = {
+    const redisMock = createRedisMock({
         getObject: mock(async (key: string) => cache[key] || null),
         setObject: mock(async (key: string, value: any) => {
             cache[key] = value;
             return true;
-        }),
-        del: mock(async () => 1)
-    };
+        })
+    });
 
-    const befly = createMockBefly(sqlMock, redisMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: redisMock as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     // 第一次调用 - 应该查询数据库
     const columns1 = await (dbHelper as any).getTableColumns("users");
@@ -209,16 +195,13 @@ test("getTableColumns - Redis 错误处理", async () => {
         unsafe: mock(async () => mockColumns)
     };
 
-    const redisMock = {
+    const redisMock = createRedisMock({
         getObject: mock(async () => {
             throw new Error("Redis 连接失败");
-        }),
-        setObject: mock(async () => true),
-        del: mock(async () => 1)
-    };
+        })
+    });
 
-    const befly = createMockBefly(sqlMock, redisMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: redisMock as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     try {
         await (dbHelper as any).getTableColumns("users");
@@ -240,8 +223,7 @@ test("getTableColumns - 字段映射正确性", async () => {
         unsafe: mock(async () => mockColumns)
     };
 
-    const befly = createMockBefly(sqlMock);
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const dbHelper = new DbHelper({ redis: createRedisMock() as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const columns = await (dbHelper as any).getTableColumns("users");
 

package/tests/dbHelper-execute.test.ts

@@ -5,17 +5,17 @@
 
 import { test, expect, mock } from "bun:test";
 
+import { MySqlDialect } from "../lib/dbDialect.js";
 import { DbHelper } from "../lib/dbHelper.js";
 
-// 创建 Mock Befly 上下文
-function createMockBefly() {
+function createMockRedis() {
     return {
-        redis: {
-            get: mock(async () => null),
-            set: mock(async () => true),
-            del: mock(async () => 1)
-        },
-        db: null
+        get: mock(async () => null),
+        set: mock(async () => true),
+        del: mock(async () => 1),
+        getObject: mock(async () => null),
+        setObject: mock(async () => true),
+        genTimeID: mock(async () => 1)
     };
 }
 
@@ -25,8 +25,8 @@ test("executeWithConn - 正常执行（无参数）", async () => {
         unsafe: mock(async () => mockResult)
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     // 使用反射访问私有方法
     const result = await (dbHelper as any).executeWithConn("SELECT * FROM users");
@@ -41,8 +41,8 @@ test("executeWithConn - 正常执行（带参数）", async () => {
         unsafe: mock(async () => mockResult)
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const result = await (dbHelper as any).executeWithConn("SELECT * FROM users WHERE id = ?", [1]);
 
@@ -58,8 +58,8 @@ test("executeWithConn - SQL 错误捕获", async () => {
         })
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     try {
         await (dbHelper as any).executeWithConn("SELECT * FROM invalid_table");
@@ -81,8 +81,8 @@ test("executeWithConn - 错误信息包含完整信息", async () => {
         })
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const testSql = "SHOW COLUMNS FROM ??";
     const testParams = ["users"];
@@ -106,8 +106,8 @@ test("executeWithConn - 超长 SQL 保留在错误对象中", async () => {
         })
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     try {
         await (dbHelper as any).executeWithConn(longSql);
@@ -128,8 +128,8 @@ test("executeWithConn - 慢查询检测（>1000ms）", async () => {
         })
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const result = await (dbHelper as any).executeWithConn("SELECT SLEEP(1)");
 
@@ -138,8 +138,8 @@ test("executeWithConn - 慢查询检测（>1000ms）", async () => {
 });
 
 test("executeWithConn - 数据库未连接错误", async () => {
-    const befly = createMockBefly(null);
-    const dbHelper = new DbHelper(befly as any, null); // 没有 sql 实例
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: null, dialect: new MySqlDialect() }); // 没有 sql 实例
 
     try {
         await (dbHelper as any).executeWithConn("SELECT * FROM users");
@@ -155,8 +155,8 @@ test("executeWithConn - 空参数数组", async () => {
         unsafe: mock(async () => mockResult)
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const result = await (dbHelper as any).executeWithConn("SELECT COUNT(*) as count FROM users", []);
 
@@ -172,8 +172,8 @@ test("executeWithConn - 复杂参数处理", async () => {
         })
     };
 
-    const befly = createMockBefly();
-    const dbHelper = new DbHelper(befly as any, sqlMock);
+    const redis = createMockRedis();
+    const dbHelper = new DbHelper({ redis: redis as any, sql: sqlMock, dialect: new MySqlDialect() });
 
     const complexParams = [1, "test", { nested: "object" }, [1, 2, 3], null, undefined];