befly 3.9.38 → 3.9.40

package/sync/syncDb/table.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * syncDb 表操作模块
  *
  * 包含：
@@ -7,16 +7,19 @@
  * - 应用变更计划
  */
 
-import { snakeCase } from 'es-toolkit/string';
-import { Logger } from '../../lib/logger.js';
-import { isMySQL, isPG, CHANGE_TYPE_LABELS, getTypeMapping, SYSTEM_INDEX_FIELDS } from './constants.js';
-import { logFieldChange, resolveDefaultValue, generateDefaultSql, isStringOrArrayType } from './helpers.js';
-import { generateDDLClause, getSystemColumnDef, isCompatibleTypeChange } from './ddl.js';
-import { getTableColumns, getTableIndexes } from './schema.js';
-import { compareFieldDefinition, applyTablePlan } from './apply.js';
-import type { TablePlan } from '../../types/sync.js';
-import type { SQL } from 'bun';
-import type { FieldDefinition } from 'befly-shared/types';
+import type { TablePlan } from "../../types/sync.js";
+import type { FieldDefinition } from "../../types/validate.js";
+import type { SQL } from "bun";
+
+import { snakeCase } from "es-toolkit/string";
+
+import { Logger } from "../../lib/logger.js";
+import { compareFieldDefinition, applyTablePlan } from "./apply.js";
+import { isMySQL, isPG, CHANGE_TYPE_LABELS, getTypeMapping, SYSTEM_INDEX_FIELDS } from "./constants.js";
+import { generateDDLClause, getSystemColumnDef, isCompatibleTypeChange } from "./ddl.js";
+import { logFieldChange } from "./helpers.js";
+import { getTableColumns, getTableIndexes } from "./schema.js";
+import { generateDefaultSql, isStringOrArrayType, resolveDefaultValue } from "./types.js";
 
 /**
  * 同步表结构（对比和应用变更）
@@ -34,14 +37,14 @@ import type { FieldDefinition } from 'befly-shared/types';
  * @param dbName - 数据库名称
  */
 export async function modifyTable(sql: SQL, tableName: string, fields: Record<string, FieldDefinition>, force: boolean = false, dbName?: string): Promise<TablePlan> {
-    const existingColumns = await getTableColumns(sql, tableName, dbName || '');
-    const existingIndexes = await getTableIndexes(sql, tableName, dbName || '');
+    const existingColumns = await getTableColumns(sql, tableName, dbName || "");
+    const existingIndexes = await getTableIndexes(sql, tableName, dbName || "");
     let changed = false;
 
     const addClauses: string[] = [];
     const modifyClauses: string[] = [];
     const defaultClauses: string[] = [];
-    const indexActions: Array<{ action: 'create' | 'drop'; indexName: string; fieldName: string }> = [];
+    const indexActions: Array<{ action: "create" | "drop"; indexName: string; fieldName: string }> = [];
 
     for (const [fieldKey, fieldDef] of Object.entries(fields)) {
         // 转换字段名为下划线格式
@@ -52,7 +55,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
             if (comparison.length > 0) {
                 for (const c of comparison) {
                     // 使用统一的日志格式函数和常量标签
-                    const changeLabel = CHANGE_TYPE_LABELS[c.type as keyof typeof CHANGE_TYPE_LABELS] || '未知';
+                    const changeLabel = CHANGE_TYPE_LABELS[c.type as keyof typeof CHANGE_TYPE_LABELS] || "未知";
                     logFieldChange(tableName, dbFieldName, c.type, c.current, c.expected, changeLabel);
                 }
 
@@ -66,20 +69,20 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
                     }
                 }
 
-                const hasTypeChange = comparison.some((c) => c.type === 'datatype');
-                const hasLengthChange = comparison.some((c) => c.type === 'length');
-                const onlyDefaultChanged = comparison.every((c) => c.type === 'default');
-                const defaultChanged = comparison.some((c) => c.type === 'default');
+                const hasTypeChange = comparison.some((c) => c.type === "datatype");
+                const hasLengthChange = comparison.some((c) => c.type === "length");
+                const onlyDefaultChanged = comparison.every((c) => c.type === "default");
+                const defaultChanged = comparison.some((c) => c.type === "default");
 
                 // 类型变更检查：只允许兼容的宽化型变更（如 INT -> BIGINT）
                 if (hasTypeChange) {
-                    const typeChange = comparison.find((c) => c.type === 'datatype');
-                    const currentType = String(typeChange?.current || '').toLowerCase();
+                    const typeChange = comparison.find((c) => c.type === "datatype");
+                    const currentType = String(typeChange?.current || "").toLowerCase();
                     const typeMapping = getTypeMapping();
-                    const expectedType = typeMapping[fieldDef.type]?.toLowerCase() || '';
+                    const expectedType = typeMapping[fieldDef.type]?.toLowerCase() || "";
 
                     if (!isCompatibleTypeChange(currentType, expectedType)) {
-                        const errorMsg = [`禁止字段类型变更: ${tableName}.${dbFieldName}`, `当前类型: ${typeChange?.current}`, `目标类型: ${typeChange?.expected}`, `说明: 仅允许宽化型变更（如 INT->BIGINT, VARCHAR->TEXT），其他类型变更需要手动处理`].join('\n');
+                        const errorMsg = [`禁止字段类型变更: ${tableName}.${dbFieldName}`, `当前类型: ${typeChange?.current}`, `目标类型: ${typeChange?.expected}`, `说明: 仅允许宽化型变更（如 INT->BIGINT, VARCHAR->TEXT），其他类型变更需要手动处理`].join("\n");
                         throw new Error(errorMsg);
                     }
                     Logger.debug(`[兼容类型变更] ${tableName}.${dbFieldName} ${currentType} -> ${expectedType}`);
@@ -92,18 +95,18 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
 
                     // 生成 SQL DEFAULT 值（不包含前导空格，因为要用于 ALTER COLUMN）
                     let v: string | null = null;
-                    if (actualDefault !== 'null') {
+                    if (actualDefault !== "null") {
                         const defaultSql = generateDefaultSql(actualDefault, fieldDef.type);
                         // 移除前导空格 ' DEFAULT ' -> 'DEFAULT '
-                        v = defaultSql.trim().replace(/^DEFAULT\s+/, '');
+                        v = defaultSql.trim().replace(/^DEFAULT\s+/, "");
                     }
 
-                    if (v !== null && v !== '') {
+                    if (v !== null && v !== "") {
                         if (isPG()) {
                             defaultClauses.push(`ALTER COLUMN "${dbFieldName}" SET DEFAULT ${v}`);
                         } else if (isMySQL() && onlyDefaultChanged) {
                             // MySQL 的 TEXT/BLOB 不允许 DEFAULT，跳过 text 类型
-                            if (fieldDef.type !== 'text') {
+                            if (fieldDef.type !== "text") {
                                 defaultClauses.push(`ALTER COLUMN \`${dbFieldName}\` SET DEFAULT ${v}`);
                             }
                         }
@@ -123,7 +126,6 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
                 changed = true;
             }
         } else {
-            const lenPart = isStringOrArrayType(fieldDef.type) ? ` 长度:${parseInt(String(fieldDef.max))}` : '';
             // Logger.debug(`  + 新增字段 ${dbFieldName} (${fieldDef.type}${lenPart})`);
             addClauses.push(generateDDLClause(fieldKey, fieldDef, true));
             changed = true;
@@ -132,7 +134,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
 
     // 检查并添加缺失的系统字段（created_at, updated_at, deleted_at, state）
     // 注意：id 是主键，不会缺失；这里只处理可能缺失的其他系统字段
-    const systemFieldNames = ['created_at', 'updated_at', 'deleted_at', 'state'];
+    const systemFieldNames = ["created_at", "updated_at", "deleted_at", "state"];
     for (const sysFieldName of systemFieldNames) {
         if (!existingColumns[sysFieldName]) {
             const colDef = getSystemColumnDef(sysFieldName);
@@ -150,7 +152,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
         // 字段已存在或刚添加到 addClauses 中
         const fieldWillExist = existingColumns[sysField] || systemFieldNames.includes(sysField);
         if (fieldWillExist && !existingIndexes[idxName]) {
-            indexActions.push({ action: 'create', indexName: idxName, fieldName: sysField });
+            indexActions.push({ action: "create", indexName: idxName, fieldName: sysField });
             changed = true;
         }
     }
@@ -163,10 +165,10 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
         const indexName = `idx_${dbFieldName}`;
         // 如果字段有 unique 约束，跳过创建普通索引（unique 会自动创建唯一索引）
         if (fieldDef.index && !fieldDef.unique && !existingIndexes[indexName]) {
-            indexActions.push({ action: 'create', indexName: indexName, fieldName: dbFieldName });
+            indexActions.push({ action: "create", indexName: indexName, fieldName: dbFieldName });
             changed = true;
         } else if (!fieldDef.index && existingIndexes[indexName] && existingIndexes[indexName].length === 1) {
-            indexActions.push({ action: 'drop', indexName: indexName, fieldName: dbFieldName });
+            indexActions.push({ action: "drop", indexName: indexName, fieldName: dbFieldName });
             changed = true;
         }
     }
@@ -179,12 +181,12 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
             const dbFieldName = snakeCase(fieldKey);
 
             if (existingColumns[dbFieldName]) {
-                const curr = existingColumns[dbFieldName].comment || '';
-                const want = fieldDef.name && fieldDef.name !== 'null' ? String(fieldDef.name) : '';
+                const curr = existingColumns[dbFieldName].comment || "";
+                const want = fieldDef.name && fieldDef.name !== "null" ? String(fieldDef.name) : "";
                 if (want !== curr) {
                     // 防止 SQL 注入：转义单引号
                     const escapedWant = want.replace(/'/g, "''");
-                    commentActions.push(`COMMENT ON COLUMN "${tableName}"."${dbFieldName}" IS ${want ? `'${escapedWant}'` : 'NULL'}`);
+                    commentActions.push(`COMMENT ON COLUMN "${tableName}"."${dbFieldName}" IS ${want ? `'${escapedWant}'` : "NULL"}`);
                     changed = true;
                 }
             }

package/sync/syncDb/tableCreate.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * syncDb 表创建模块
  *
  * 包含：
@@ -8,15 +8,16 @@
  *
  * 注意：此模块从 table.ts 中提取，用于解除循环依赖
  */
-import { snakeCase } from 'es-toolkit/string';
-import { Logger } from '../../lib/logger.js';
-import { isMySQL, isPG, IS_PLAN, MYSQL_TABLE_CONFIG } from './constants.js';
-import { quoteIdentifier } from './helpers.js';
-import { buildSystemColumnDefs, buildBusinessColumnDefs, buildIndexSQL } from './ddl.js';
-import { getTableIndexes } from './schema.js';
+import type { FieldDefinition } from "../../types/validate.js";
+import type { SQL } from "bun";
+
+import { snakeCase } from "es-toolkit/string";
 
-import type { SQL } from 'bun';
-import type { FieldDefinition } from 'befly-shared/types';
+import { Logger } from "../../lib/logger.js";
+import { isMySQL, isPG, IS_PLAN, MYSQL_TABLE_CONFIG } from "./constants.js";
+import { buildSystemColumnDefs, buildBusinessColumnDefs, buildIndexSQL } from "./ddl.js";
+import { quoteIdentifier } from "./helpers.js";
+import { getTableIndexes } from "./schema.js";
 
 /**
  * 为 PostgreSQL 表添加列注释（使用字段的 name 作为注释）
@@ -28,11 +29,11 @@ import type { FieldDefinition } from 'befly-shared/types';
 async function addPostgresComments(sql: SQL, tableName: string, fields: Record<string, FieldDefinition>): Promise<void> {
     // 系统字段注释
     const systemComments = [
-        ['id', '主键ID'],
-        ['created_at', '创建时间'],
-        ['updated_at', '更新时间'],
-        ['deleted_at', '删除时间'],
-        ['state', '状态字段']
+        ["id", "主键ID"],
+        ["created_at", "创建时间"],
+        ["updated_at", "更新时间"],
+        ["deleted_at", "删除时间"],
+        ["state", "状态字段"]
     ];
 
     for (const [name, comment] of systemComments) {
@@ -74,7 +75,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
     // 获取现有索引（MySQL 不支持 IF NOT EXISTS，需要先检查）
     let existingIndexes: Record<string, string[]> = {};
     if (isMySQL()) {
-        existingIndexes = await getTableIndexes(sql, tableName, dbName || '');
+        existingIndexes = await getTableIndexes(sql, tableName, dbName || "");
     }
 
     // 系统字段索引
@@ -84,7 +85,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
         if (isMySQL() && existingIndexes[indexName]) {
             continue;
         }
-        const stmt = buildIndexSQL(tableName, indexName, sysField, 'create');
+        const stmt = buildIndexSQL(tableName, indexName, sysField, "create");
         if (IS_PLAN) {
             Logger.debug(`[计划] ${stmt}`);
         } else {
@@ -103,7 +104,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
             if (isMySQL() && existingIndexes[indexName]) {
                 continue;
             }
-            const stmt = buildIndexSQL(tableName, indexName, dbFieldName, 'create');
+            const stmt = buildIndexSQL(tableName, indexName, dbFieldName, "create");
             if (IS_PLAN) {
                 Logger.debug(`[计划] ${stmt}`);
             } else {
@@ -127,12 +128,12 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
  * @param systemIndexFields - 系统字段索引列表（可选，默认使用 ['created_at', 'updated_at', 'state']）
  * @param dbName - 数据库名称（用于检查索引是否存在）
  */
-export async function createTable(sql: SQL, tableName: string, fields: Record<string, FieldDefinition>, systemIndexFields: string[] = ['created_at', 'updated_at', 'state'], dbName?: string): Promise<void> {
+export async function createTable(sql: SQL, tableName: string, fields: Record<string, FieldDefinition>, systemIndexFields: string[] = ["created_at", "updated_at", "state"], dbName?: string): Promise<void> {
     // 构建列定义
     const colDefs = [...buildSystemColumnDefs(), ...buildBusinessColumnDefs(fields)];
 
     // 生成 CREATE TABLE 语句
-    const cols = colDefs.join(',\n            ');
+    const cols = colDefs.join(",\n            ");
     const tableQuoted = quoteIdentifier(tableName);
     const { ENGINE, CHARSET, COLLATE } = MYSQL_TABLE_CONFIG;
     const createSQL = isMySQL()
@@ -144,7 +145,7 @@ export async function createTable(sql: SQL, tableName: string, fields: Record<st
         )`;
 
     if (IS_PLAN) {
-        Logger.debug(`[计划] ${createSQL.replace(/\n+/g, ' ')}`);
+        Logger.debug(`[计划] ${createSQL.replace(/\n+/g, " ")}`);
     } else {
         await sql.unsafe(createSQL);
     }

package/sync/syncDb/types.ts

@@ -7,7 +7,7 @@
  * - 类型判断工具
  */
 
-import { isMySQL, getTypeMapping } from './constants.js';
+import { isMySQL, getTypeMapping } from "./constants.js";
 
 /**
  * 判断是否为字符串或数组类型（需要长度参数）
@@ -18,12 +18,13 @@ import { isMySQL, getTypeMapping } from './constants.js';
  * @example
  * isStringOrArrayType('string') // => true
  * isStringOrArrayType('array_string') // => true
+ * isStringOrArrayType('array_number_string') // => true
  * isStringOrArrayType('array_text') // => false
  * isStringOrArrayType('number') // => false
  * isStringOrArrayType('text') // => false
  */
 export function isStringOrArrayType(fieldType: string): boolean {
-    return fieldType === 'string' || fieldType === 'array_string';
+    return fieldType === "string" || fieldType === "array_string" || fieldType === "array_number_string";
 }
 
 /**
@@ -47,8 +48,8 @@ export function getSqlType(fieldType: string, fieldMax: number | null, unsigned:
         return `${typeMapping[fieldType]}(${fieldMax})`;
     }
     // 处理 UNSIGNED 修饰符（仅 MySQL number 类型）
-    const baseType = typeMapping[fieldType] || 'TEXT';
-    if (isMySQL() && fieldType === 'number' && unsigned) {
+    const baseType = typeMapping[fieldType] || "TEXT";
+    if (isMySQL() && fieldType === "number" && unsigned) {
         return `${baseType} UNSIGNED`;
     }
     return baseType;
@@ -73,22 +74,24 @@ export function getSqlType(fieldType: string, fieldMax: number | null, unsigned:
  */
 export function resolveDefaultValue(fieldDefault: any, fieldType: string): any {
     // null 或字符串 'null' 都表示使用类型默认值
-    if (fieldDefault !== null && fieldDefault !== 'null') {
+    if (fieldDefault !== null && fieldDefault !== "null") {
         return fieldDefault;
     }
 
     // null 表示使用类型默认值
     switch (fieldType) {
-        case 'number':
+        case "number":
             return 0;
-        case 'string':
-            return '';
-        case 'array_string':
-            return '[]';
-        case 'text':
-        case 'array_text':
-            // text/array_text 类型不设置默认值（MySQL TEXT 不支持），保持 'null'
-            return 'null';
+        case "string":
+            return "";
+        case "array_string":
+        case "array_number_string":
+            return "[]";
+        case "text":
+        case "array_text":
+        case "array_number_text":
+            // text/array_text/array_number_text 类型不设置默认值（MySQL TEXT 不支持），保持 'null'
+            return "null";
         default:
             return fieldDefault;
     }
@@ -110,13 +113,13 @@ export function resolveDefaultValue(fieldDefault: any, fieldType: string): any {
  */
 export function generateDefaultSql(actualDefault: any, fieldType: string): string {
     // text 和 array_text 类型不设置默认值（MySQL TEXT 类型不支持默认值）
-    if (fieldType === 'text' || fieldType === 'array_text' || actualDefault === 'null') {
-        return '';
+    if (fieldType === "text" || fieldType === "array_text" || actualDefault === "null") {
+        return "";
     }
 
-    // 仅 number/string/array_string 类型设置默认值
-    if (fieldType === 'number' || fieldType === 'string' || fieldType === 'array_string') {
-        if (typeof actualDefault === 'number' && !Number.isNaN(actualDefault)) {
+    // 仅 number/string/array_string/array_number_string 类型设置默认值
+    if (fieldType === "number" || fieldType === "string" || fieldType === "array_string" || fieldType === "array_number_string") {
+        if (typeof actualDefault === "number" && !Number.isNaN(actualDefault)) {
             return ` DEFAULT ${actualDefault}`;
         } else {
             // 字符串需要转义单引号：' -> ''
@@ -125,5 +128,5 @@ export function generateDefaultSql(actualDefault: any, fieldType: string): strin
         }
     }
 
-    return '';
+    return "";
 }

package/sync/syncDb/version.ts

@@ -1,13 +1,13 @@
-/**
+/**
  * syncDb 数据库版本检查模块
  *
  * 包含：
  * - 数据库版本验证（MySQL/PostgreSQL/SQLite）
  */
 
-import { Logger } from '../../lib/logger.js';
-import { DB_VERSION_REQUIREMENTS, isMySQL, isPG, isSQLite } from './constants.js';
-import type { SQL } from 'bun';
+import type { SQL } from "bun";
+
+import { DB_VERSION_REQUIREMENTS, isMySQL, isPG, isSQLite } from "./constants.js";
 
 /**
  * 数据库版本检查（按方言）
@@ -21,15 +21,15 @@ import type { SQL } from 'bun';
  * @throws {Error} 如果数据库版本不符合要求或无法获取版本信息
  */
 export async function ensureDbVersion(sql: SQL): Promise<void> {
-    if (!sql) throw new Error('SQL 客户端未初始化');
+    if (!sql) throw new Error("SQL 客户端未初始化");
 
     if (isMySQL()) {
         const r = await sql`SELECT VERSION() AS version`;
         if (!r || r.length === 0 || !r[0]?.version) {
-            throw new Error('无法获取 MySQL 版本信息');
+            throw new Error("无法获取 MySQL 版本信息");
         }
         const version = r[0].version;
-        const majorVersion = parseInt(String(version).split('.')[0], 10);
+        const majorVersion = parseInt(String(version).split(".")[0], 10);
         if (!Number.isFinite(majorVersion) || majorVersion < DB_VERSION_REQUIREMENTS.MYSQL_MIN_MAJOR) {
             throw new Error(`此脚本仅支持 MySQL ${DB_VERSION_REQUIREMENTS.MYSQL_MIN_MAJOR}.0+，当前版本: ${version}`);
         }
@@ -39,7 +39,7 @@ export async function ensureDbVersion(sql: SQL): Promise<void> {
     if (isPG()) {
         const r = await sql`SELECT version() AS version`;
         if (!r || r.length === 0 || !r[0]?.version) {
-            throw new Error('无法获取 PostgreSQL 版本信息');
+            throw new Error("无法获取 PostgreSQL 版本信息");
         }
         const versionText = r[0].version;
         const m = /PostgreSQL\s+(\d+)/i.exec(versionText);
@@ -53,12 +53,12 @@ export async function ensureDbVersion(sql: SQL): Promise<void> {
     if (isSQLite()) {
         const r = await sql`SELECT sqlite_version() AS version`;
         if (!r || r.length === 0 || !r[0]?.version) {
-            throw new Error('无法获取 SQLite 版本信息');
+            throw new Error("无法获取 SQLite 版本信息");
         }
         const version = r[0].version;
         // 强制最低版本：SQLite ≥ 3.50.0
         const [maj, min, patch] = String(version)
-            .split('.')
+            .split(".")
             .map((v) => parseInt(v, 10) || 0);
         const vnum = maj * 10000 + min * 100 + patch; // 3.50.0 -> 35000
         if (!Number.isFinite(vnum) || vnum < DB_VERSION_REQUIREMENTS.SQLITE_MIN_VERSION_NUM) {

package/sync/syncDb.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * SyncDb 命令 - 同步数据库表结构
  *
  * 功能：
@@ -7,28 +7,30 @@
  * - 提供统计信息和错误处理
  */
 
-import { resolve } from 'pathe';
-import { existsSync } from 'node:fs';
-import { snakeCase } from 'es-toolkit/string';
-import { Connect } from '../lib/connect.js';
-import { RedisHelper } from '../lib/redisHelper.js';
-import { checkTable } from '../checks/checkTable.js';
-import { scanFiles } from 'befly-shared/scanFiles';
-import { scanAddons, addonDirExists, getAddonDir } from 'befly-shared/addonHelper';
-import { RedisKeys } from 'befly-shared/redisKeys';
-import { Logger } from '../lib/logger.js';
-import { projectDir } from '../paths.js';
-
+import type { SyncDbOptions } from "../types/sync.js";
+import type { SQL } from "bun";
+
+import { existsSync } from "node:fs";
+
+import { snakeCase } from "es-toolkit/string";
+import { resolve } from "pathe";
+
+import { beflyConfig } from "../befly.config.js";
+import { checkTable } from "../checks/checkTable.js";
+import { CacheKeys } from "../lib/cacheKeys.js";
+import { Connect } from "../lib/connect.js";
+import { Logger } from "../lib/logger.js";
+import { RedisHelper } from "../lib/redisHelper.js";
+import { projectDir } from "../paths.js";
+import { scanAddons, addonDirExists, getAddonDir } from "../utils/addonHelper.js";
+import { scanFiles } from "../utils/scanFiles.js";
+import { setDbType } from "./syncDb/constants.js";
+import { applyFieldDefaults } from "./syncDb/helpers.js";
+import { tableExists } from "./syncDb/schema.js";
+import { modifyTable } from "./syncDb/table.js";
+import { createTable } from "./syncDb/tableCreate.js";
 // 导入模块化的功能
-import { ensureDbVersion } from './syncDb/version.js';
-import { tableExists } from './syncDb/schema.js';
-import { modifyTable } from './syncDb/table.js';
-import { createTable } from './syncDb/tableCreate.js';
-import { applyFieldDefaults } from './syncDb/helpers.js';
-import { setDbType } from './syncDb/constants.js';
-import { beflyConfig } from '../befly.config.js';
-import type { SQL } from 'bun';
-import type { SyncDbOptions } from '../types/index.js';
+import { ensureDbVersion } from "./syncDb/version.js";
 
 // 全局 SQL 客户端实例
 let sql: SQL | null = null;
@@ -51,7 +53,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
         processedTables.length = 0;
 
         // 设置数据库类型（从配置获取）
-        const dbType = beflyConfig.db?.type || 'mysql';
+        const dbType = beflyConfig.db?.type || "mysql";
         setDbType(dbType);
 
         // 验证表定义文件
@@ -65,21 +67,26 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
         await Connect.connectRedis();
 
         // 扫描表定义文件
-        const directories: Array<{ path: string; type: 'app' | 'addon'; addonName?: string; addonNameSnake?: string }> = [];
+        const directories: Array<{
+            path: string;
+            type: "app" | "addon";
+            addonName?: string;
+            addonNameSnake?: string;
+        }> = [];
 
         // 1. 项目表（无前缀）- 如果 tables 目录存在
-        const projectTablesDir = resolve(projectDir, 'tables');
+        const projectTablesDir = resolve(projectDir, "tables");
         if (existsSync(projectTablesDir)) {
-            directories.push({ path: projectTablesDir, type: 'app' });
+            directories.push({ path: projectTablesDir, type: "app" });
         }
 
         // 添加所有 addon 的 tables 目录（addon_{name}_ 前缀）
         const addons = scanAddons();
         for (const addon of addons) {
-            if (addonDirExists(addon, 'tables')) {
+            if (addonDirExists(addon, "tables")) {
                 directories.push({
-                    path: getAddonDir(addon, 'tables'),
-                    type: 'addon',
+                    path: getAddonDir(addon, "tables"),
+                    type: "addon",
                     addonName: addon,
                     addonNameSnake: snakeCase(addon) // 提前转换，避免每个文件都转换
                 });
@@ -90,7 +97,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
         for (const dirConfig of directories) {
             const { path: dir, type } = dirConfig;
 
-            const files = await scanFiles(dir, '*.json');
+            const files = await scanFiles(dir, "*.json");
 
             for (const { filePath: file, fileName } of files) {
                 // 确定表名：
@@ -99,7 +106,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
                 // - 项目表：{表名}
                 //   例如：user.json → user
                 let tableName = snakeCase(fileName);
-                if (type === 'addon' && dirConfig.addonNameSnake) {
+                if (type === "addon" && dirConfig.addonNameSnake) {
                     // addon 表，使用提前转换好的名称
                     tableName = `addon_${dirConfig.addonNameSnake}_${tableName}`;
                 }
@@ -109,7 +116,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
                     continue;
                 }
 
-                const tableDefinitionModule = await import(file, { with: { type: 'json' } });
+                const tableDefinitionModule = await import(file, { with: { type: "json" } });
                 const tableDefinition = tableDefinitionModule.default;
 
                 // 为字段属性设置默认值
@@ -117,7 +124,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
                     applyFieldDefaults(fieldDef);
                 }
 
-                const dbName = beflyConfig.db?.database || '';
+                const dbName = beflyConfig.db?.database || "";
                 const existsTable = await tableExists(sql!, tableName, dbName);
 
                 // 读取 force 参数
@@ -126,7 +133,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
                 if (existsTable) {
                     await modifyTable(sql!, tableName, tableDefinition, force, dbName);
                 } else {
-                    await createTable(sql!, tableName, tableDefinition, ['created_at', 'updated_at', 'state'], dbName);
+                    await createTable(sql!, tableName, tableDefinition, ["created_at", "updated_at", "state"], dbName);
                 }
 
                 // 记录处理过的表名（用于清理缓存）
@@ -137,11 +144,11 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
         // 清理 Redis 缓存（如果有表被处理）
         if (processedTables.length > 0) {
             const redisHelper = new RedisHelper();
-            const cacheKeys = processedTables.map((tableName) => RedisKeys.tableColumns(tableName));
+            const cacheKeys = processedTables.map((tableName) => CacheKeys.tableColumns(tableName));
             await redisHelper.delBatch(cacheKeys);
         }
     } catch (error: any) {
-        Logger.error({ err: error }, '数据库同步失败');
+        Logger.error({ err: error }, "数据库同步失败");
         throw error;
     } finally {
         if (sql) {