befly 3.9.0 → 3.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.9.0",
+    "version": "3.9.2",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -73,7 +73,7 @@
         "pino": "^10.1.0",
         "pino-roll": "^4.0.0"
     },
-    "gitHead": "ebb51601e566ac01ef09824309a6ec60a5d32388",
+    "gitHead": "a311a415ccf02fb5089040883049a02a54f5ec60",
     "devDependencies": {
         "typescript": "^5.9.3"
     }

package/sync/syncDb/ddl.ts

@@ -60,16 +60,39 @@ export function buildIndexSQL(tableName: string, indexName: string, fieldName: s
     return `DROP INDEX IF EXISTS ${indexQuoted}`;
 }
 
+/**
+ * 获取单个系统字段的列定义（用于 ADD COLUMN 或 CREATE TABLE）
+ *
+ * @param fieldName - 系统字段名（id, created_at, updated_at, deleted_at, state）
+ * @returns 列定义字符串，如果不是系统字段则返回 null
+ */
+export function getSystemColumnDef(fieldName: string): string | null {
+    const mysqlDefs: Record<string, string> = {
+        id: '`id` BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT COMMENT "主键ID"',
+        created_at: '`created_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "创建时间"',
+        updated_at: '`updated_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "更新时间"',
+        deleted_at: '`deleted_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "删除时间"',
+        state: '`state` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "状态字段"'
+    };
+    const pgDefs: Record<string, string> = {
+        id: '"id" INTEGER PRIMARY KEY',
+        created_at: '"created_at" INTEGER NOT NULL DEFAULT 0',
+        updated_at: '"updated_at" INTEGER NOT NULL DEFAULT 0',
+        deleted_at: '"deleted_at" INTEGER NOT NULL DEFAULT 0',
+        state: '"state" INTEGER NOT NULL DEFAULT 0'
+    };
+
+    const defs = isMySQL() ? mysqlDefs : pgDefs;
+    return defs[fieldName] || null;
+}
+
 /**
  * 构建系统字段列定义
  *
  * @returns 系统字段的列定义数组
  */
 export function buildSystemColumnDefs(): string[] {
-    if (isMySQL()) {
-        return ['`id` BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT COMMENT "主键ID"', '`created_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "创建时间"', '`updated_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "更新时间"', '`deleted_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "删除时间"', '`state` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "状态字段"'];
-    }
-    return ['"id" INTEGER PRIMARY KEY', '"created_at" INTEGER NOT NULL DEFAULT 0', '"updated_at" INTEGER NOT NULL DEFAULT 0', '"deleted_at" INTEGER NOT NULL DEFAULT 0', '"state" INTEGER NOT NULL DEFAULT 0'];
+    return [getSystemColumnDef('id')!, getSystemColumnDef('created_at')!, getSystemColumnDef('updated_at')!, getSystemColumnDef('deleted_at')!, getSystemColumnDef('state')!];
 }
 
 /**

package/sync/syncDb/table.ts

@@ -9,9 +9,9 @@
 
 import { snakeCase } from 'es-toolkit/string';
 import { Logger } from '../../lib/logger.js';
-import { isMySQL, isPG, CHANGE_TYPE_LABELS, getTypeMapping } from './constants.js';
+import { isMySQL, isPG, CHANGE_TYPE_LABELS, getTypeMapping, SYSTEM_INDEX_FIELDS } from './constants.js';
 import { logFieldChange, resolveDefaultValue, generateDefaultSql, isStringOrArrayType } from './helpers.js';
-import { generateDDLClause, isPgCompatibleTypeChange } from './ddl.js';
+import { generateDDLClause, isPgCompatibleTypeChange, getSystemColumnDef } from './ddl.js';
 import { getTableColumns, getTableIndexes } from './schema.js';
 import { compareFieldDefinition, applyTablePlan } from './apply.js';
 import type { TablePlan } from '../../types/sync.js';
@@ -130,10 +130,26 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
         }
     }
 
-    // 检查系统字段索引
-    for (const sysField of ['created_at', 'updated_at', 'state']) {
+    // 检查并添加缺失的系统字段（created_at, updated_at, deleted_at, state）
+    // 注意：id 是主键，不会缺失；这里只处理可能缺失的其他系统字段
+    const systemFieldNames = ['created_at', 'updated_at', 'deleted_at', 'state'];
+    for (const sysFieldName of systemFieldNames) {
+        if (!existingColumns[sysFieldName]) {
+            const colDef = getSystemColumnDef(sysFieldName);
+            if (colDef) {
+                Logger.debug(`  + 新增系统字段 ${sysFieldName}`);
+                addClauses.push(`ADD COLUMN ${colDef}`);
+                changed = true;
+            }
+        }
+    }
+
+    // 检查系统字段索引（字段存在或即将被添加时才创建索引）
+    for (const sysField of SYSTEM_INDEX_FIELDS) {
         const idxName = `idx_${sysField}`;
-        if (!existingIndexes[idxName]) {
+        // 字段已存在或刚添加到 addClauses 中
+        const fieldWillExist = existingColumns[sysField] || systemFieldNames.includes(sysField);
+        if (fieldWillExist && !existingIndexes[idxName]) {
             indexActions.push({ action: 'create', indexName: idxName, fieldName: sysField });
             changed = true;
         }

package/sync/syncDb/types.ts

@@ -65,8 +65,9 @@ export function getSqlType(fieldType: string, fieldMax: number | null, unsigned:
  * resolveDefaultValue(null, 'string') // => ''
  * resolveDefaultValue(null, 'number') // => 0
  * resolveDefaultValue('null', 'number') // => 0
- * resolveDefaultValue(null, 'array') // => '[]'
+ * resolveDefaultValue(null, 'array_string') // => '[]'
  * resolveDefaultValue(null, 'text') // => 'null'
+ * resolveDefaultValue(null, 'array_text') // => 'null' (TEXT 不支持默认值)
  * resolveDefaultValue('admin', 'string') // => 'admin'
  * resolveDefaultValue(0, 'number') // => 0
  */
@@ -82,12 +83,11 @@ export function resolveDefaultValue(fieldDefault: any, fieldType: string): any {
             return 0;
         case 'string':
             return '';
-        case 'array':
         case 'array_string':
-        case 'array_text':
             return '[]';
         case 'text':
-            // text 类型不设置默认值，保持 'null'
+        case 'array_text':
+            // text/array_text 类型不设置默认值（MySQL TEXT 不支持），保持 'null'
             return 'null';
         default:
             return fieldDefault;

package/tests/syncDb-types.test.ts

@@ -63,14 +63,18 @@ describe('resolveDefaultValue', () => {
         expect(resolveDefaultValue('null', 'number')).toBe(0);
     });
 
-    test('null 值 + array 类型 => "[]"', () => {
-        expect(resolveDefaultValue(null, 'array')).toBe('[]');
+    test('null 值 + array_string 类型 => "[]"', () => {
+        expect(resolveDefaultValue(null, 'array_string')).toBe('[]');
     });
 
     test('null 值 + text 类型 => "null"', () => {
         expect(resolveDefaultValue(null, 'text')).toBe('null');
     });
 
+    test('null 值 + array_text 类型 => "null"（TEXT 不支持默认值）', () => {
+        expect(resolveDefaultValue(null, 'array_text')).toBe('null');
+    });
+
     test('有实际值时直接返回', () => {
         expect(resolveDefaultValue('admin', 'string')).toBe('admin');
         expect(resolveDefaultValue(100, 'number')).toBe(100);