befly 3.15.22 → 3.15.23

package/dist/befly.js

@@ -10403,23 +10403,7 @@ class SyncTable {
         }
         tableTasks.push(task);
       }
-      if (incompatibleTypeChanges.length > 0) {
-        const lines = [];
-        for (const change of incompatibleTypeChanges) {
-          lines.push(`- ${change.tableName}.${change.dbFieldName}: ${change.currentType} -> ${change.expectedType}`);
-        }
-        const msgLines = [];
-        msgLines.push("\u7981\u6B62\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4\uFF08\u68C0\u6D4B\u5230\u4E0D\u517C\u5BB9/\u6536\u7F29\u53D8\u66F4\uFF09:");
-        for (const line of lines) {
-          msgLines.push(line);
-        }
-        msgLines.push("\u8BF4\u660E: \u4EC5\u5141\u8BB8\u540C\u7C7B\u578B\u7684\u5BBD\u5316\u53D8\u66F4\uFF08\u5982 TINYINT->SMALLINT->INT->BIGINT\uFF09\uFF0C\u4EE5\u53CA\u90E8\u5206\u517C\u5BB9\u53D8\u66F4\uFF08\u5982 VARCHAR->TEXT\u3001CHAR/VARCHAR \u4E92\u8F6C\u3001float->double\uFF09\u3002");
-        msgLines.push("\u63D0\u793A: \u82E5\u786E\u9700\u6536\u7F29\uFF0C\u8BF7\u5148\u624B\u5DE5\u8FC1\u79FB/\u6E05\u6D17\u6570\u636E\u540E\u518D\u6267\u884C\u540C\u6B65\u3002");
-        const err = new Error(msgLines.join(`
-`));
-        err.__syncTableNoLog = true;
-        throw err;
-      }
+      SyncTable.throwIfIncompatibleTypeChanges(incompatibleTypeChanges);
       for (const task of tableTasks) {
         if (!task.existsTable) {
           continue;
@@ -10436,7 +10420,11 @@ class SyncTable {
         task.plan = built.plan;
         task.planSummary = built.summary;
         task.planDetails = built.details;
+        for (const change of built.incompatibleTypeChanges) {
+          incompatibleTypeChanges.push(change);
+        }
       }
+      SyncTable.throwIfIncompatibleTypeChanges(incompatibleTypeChanges);
       for (const task of tableTasks) {
         const item = task.item;
         const tableName = task.tableName;
@@ -10502,6 +10490,9 @@ class SyncTable {
       if (error?.__syncTableLogged === true) {
         throw error;
       }
+      if (isCoreError(error) && error.noLog === true) {
+        throw error;
+      }
       if (error?.__syncTableNoLog === true) {
         throw error;
       }
@@ -10744,6 +10735,7 @@ class SyncTable {
     const addedBusiness = fieldPlan.addedBusiness;
     const modified = fieldPlan.modified;
     const addedSystem = systemPlan.addedSystem;
+    const incompatibleTypeChanges = fieldPlan.incompatibleTypeChanges;
     const plan = {
       changed: alterClauses.length > 0 || indexActions.length > 0,
       alterClauses,
@@ -10760,7 +10752,8 @@ class SyncTable {
       details: {
         fieldChanges: fieldPlan.changeDetails,
         indexChanges: indexPlan.indexActions
-      }
+      },
+      incompatibleTypeChanges
     };
   }
   static buildFieldPlan(options) {
@@ -10768,6 +10761,7 @@ class SyncTable {
     let addedBusiness = 0;
     let modified = 0;
     const changeDetails = [];
+    const incompatibleTypeChanges = [];
     for (const [fieldKey, fieldDef] of Object.entries(options.fields)) {
       const dbFieldName = snakeCase(fieldKey);
       if (options.existingColumns[dbFieldName]) {
@@ -10775,7 +10769,14 @@ class SyncTable {
         if (comparison.length > 0) {
           modified = modified + 1;
           changeDetails.push({ fieldKey, dbFieldName, changes: comparison });
-          SyncTable.assertCompatibleTypeChange(options.tableName, dbFieldName, comparison, fieldDef);
+          const typeChange = comparison.find((c) => c.type === "datatype");
+          if (typeChange) {
+            const expectedType = SyncTable.getSqlType(fieldDef.type, fieldDef.max ?? null, fieldDef.unsigned ?? false, fieldDef.precision ?? null, fieldDef.scale ?? null);
+            const incompatible = SyncTable.getIncompatibleTypeChange(options.tableName, dbFieldName, String(typeChange.current ?? ""), expectedType);
+            if (incompatible) {
+              incompatibleTypeChanges.push(incompatible);
+            }
+          }
           alterClauses.push(SyncTable.generateDDLClause(fieldKey, fieldDef, false));
         }
       } else {
@@ -10783,7 +10784,7 @@ class SyncTable {
         alterClauses.push(SyncTable.generateDDLClause(fieldKey, fieldDef, true));
       }
     }
-    return { alterClauses, addedBusiness, modified, changeDetails };
+    return { alterClauses, addedBusiness, modified, changeDetails, incompatibleTypeChanges };
   }
   static buildSystemFieldPlan(options) {
     const alterClauses = [];
@@ -10819,17 +10820,20 @@ class SyncTable {
     ];
     return { indexActions };
   }
-  static assertCompatibleTypeChange(tableName, dbFieldName, comparison, fieldDef) {
-    const typeChange = comparison.find((c) => c.type === "datatype");
-    if (!typeChange)
-      return;
-    const currentType = String(typeChange.current || "").toLowerCase();
-    const expectedType = SyncTable.getSqlType(fieldDef.type, fieldDef.max ?? null, fieldDef.unsigned ?? false, fieldDef.precision ?? null, fieldDef.scale ?? null).toLowerCase();
+  static getIncompatibleTypeChange(tableName, dbFieldName, currentTypeRaw, expectedTypeRaw) {
+    const currentType = String(currentTypeRaw || "").toLowerCase();
+    const expectedType = String(expectedTypeRaw || "").toLowerCase();
     const currentBase = currentType.replace(/\s*unsigned/gi, "").replace(/\([^)]*\)/g, "").trim();
     const expectedBase = expectedType.replace(/\s*unsigned/gi, "").replace(/\([^)]*\)/g, "").trim();
-    if (currentBase !== expectedBase && !SyncTable.isCompatibleTypeChange(currentType, expectedType))
-      throw new Error([`\u7981\u6B62\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4: ${tableName}.${dbFieldName}`, `\u5F53\u524D\u7C7B\u578B: ${typeChange.current}`, `\u76EE\u6807\u7C7B\u578B: ${typeChange.expected}`, "\u8BF4\u660E: \u4EC5\u5141\u8BB8\u5BBD\u5316\u578B\u53D8\u66F4\uFF08\u5982 INT->BIGINT, VARCHAR->TEXT\uFF09\uFF0C\u4EE5\u53CA CHAR/VARCHAR \u4E92\u8F6C\uFF1BDATETIME \u4E0E BIGINT \u4E0D\u5141\u8BB8\u4E92\u8F6C\uFF08\u9700\u8981\u624B\u52A8\u8FC1\u79FB\u6570\u636E\uFF09"].join(`
-`));
+    if (currentBase !== expectedBase && !SyncTable.isCompatibleTypeChange(currentType, expectedType)) {
+      return {
+        tableName,
+        dbFieldName,
+        currentType: String(currentTypeRaw ?? ""),
+        expectedType: String(expectedTypeRaw ?? "")
+      };
+    }
+    return null;
   }
   static collectIncompatibleTypeChanges(tableName, existingColumns, fields) {
     const out = [];
@@ -10842,21 +10846,37 @@ class SyncTable {
       const typeChange = comparison.find((c) => c.type === "datatype");
       if (!typeChange)
         continue;
-      const currentType = String(typeChange.current || "").toLowerCase();
-      const expectedType = String(typeChange.expected || "").toLowerCase();
-      const currentBase = currentType.replace(/\s*unsigned/gi, "").replace(/\([^)]*\)/g, "").trim();
-      const expectedBase = expectedType.replace(/\s*unsigned/gi, "").replace(/\([^)]*\)/g, "").trim();
-      if (currentBase !== expectedBase && !SyncTable.isCompatibleTypeChange(currentType, expectedType)) {
-        out.push({
-          tableName,
-          dbFieldName,
-          currentType: String(typeChange.current ?? ""),
-          expectedType: String(typeChange.expected ?? "")
-        });
+      const expectedType = SyncTable.getSqlType(fieldDef.type, fieldDef.max ?? null, fieldDef.unsigned ?? false, fieldDef.precision ?? null, fieldDef.scale ?? null);
+      const incompatible = SyncTable.getIncompatibleTypeChange(tableName, dbFieldName, String(typeChange.current ?? ""), expectedType);
+      if (incompatible) {
+        out.push(incompatible);
       }
     }
     return out;
   }
+  static throwIfIncompatibleTypeChanges(incompatibleTypeChanges) {
+    if (incompatibleTypeChanges.length === 0) {
+      return;
+    }
+    const lines = [];
+    for (const change of incompatibleTypeChanges) {
+      lines.push(`- ${change.tableName}.${change.dbFieldName}: ${change.currentType} -> ${change.expectedType}`);
+    }
+    const msgLines = [];
+    msgLines.push("\u7981\u6B62\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4\uFF08\u68C0\u6D4B\u5230\u4E0D\u517C\u5BB9/\u6536\u7F29\u53D8\u66F4\uFF09:");
+    for (const line of lines) {
+      msgLines.push(line);
+    }
+    msgLines.push("\u8BF4\u660E: \u4EC5\u5141\u8BB8\u540C\u7C7B\u578B\u7684\u5BBD\u5316\u53D8\u66F4\uFF08\u5982 TINYINT->SMALLINT->INT->BIGINT\uFF09\uFF0C\u4EE5\u53CA\u90E8\u5206\u517C\u5BB9\u53D8\u66F4\uFF08\u5982 VARCHAR->TEXT\u3001CHAR/VARCHAR \u4E92\u8F6C\u3001float->double\uFF09\u3002");
+    msgLines.push("\u63D0\u793A: \u82E5\u786E\u9700\u6536\u7F29\uFF0C\u8BF7\u5148\u624B\u5DE5\u8FC1\u79FB/\u6E05\u6D17\u6570\u636E\u540E\u518D\u6267\u884C\u540C\u6B65\u3002");
+    throw new CoreError({
+      kind: "policy",
+      message: msgLines.join(`
+`),
+      noLog: true,
+      meta: { subsystem: "syncTable", operation: "precheck" }
+    });
+  }
   static truncateForLog(input, maxLen) {
     const s = String(input);
     if (maxLen <= 0)