befly 3.15.6 → 3.15.8

package/dist/befly.js

@@ -10105,17 +10105,18 @@ class SyncTable {
     }
     return "";
   }
-  static buildIndexSQL(tableName, indexName, fieldName, action) {
-    const tableQuoted = SyncTable.quoteIdentifier(tableName);
+  static buildIndexClause(indexName, fieldName, action) {
     const indexQuoted = SyncTable.quoteIdentifier(indexName);
-    const fieldQuoted = SyncTable.quoteIdentifier(fieldName);
-    const parts = [];
     if (action === "create") {
-      parts.push(`ADD INDEX ${indexQuoted} (${fieldQuoted})`);
-    } else {
-      parts.push(`DROP INDEX ${indexQuoted}`);
+      const fieldQuoted = SyncTable.quoteIdentifier(fieldName);
+      return `ADD INDEX ${indexQuoted} (${fieldQuoted})`;
     }
-    return `ALTER TABLE ${tableQuoted} ALGORITHM=INPLACE, LOCK=NONE, ${parts.join(", ")}`;
+    return `DROP INDEX ${indexQuoted}`;
+  }
+  static buildIndexSQL(tableName, indexName, fieldName, action) {
+    const tableQuoted = SyncTable.quoteIdentifier(tableName);
+    const clause = SyncTable.buildIndexClause(indexName, fieldName, action);
+    return `ALTER TABLE ${tableQuoted} ALGORITHM=INPLACE, LOCK=NONE, ${clause}`;
   }
   static getSystemColumnDef(fieldName) {
     let meta = null;
@@ -10165,23 +10166,49 @@ class SyncTable {
     const nullableSql = normalized.nullable ? " NULL" : " NOT NULL";
     return `${isAdd ? "ADD COLUMN" : "MODIFY COLUMN"} ${colQuoted} ${sqlType}${uniqueSql}${nullableSql}${defaultSql} COMMENT "${escapeComment(normalized.name)}"`;
   }
+  static stripAlgorithmAndLock(stmt) {
+    let sql = String(stmt);
+    sql = sql.replace(/\bALGORITHM\s*=\s*(INPLACE|INSTANT|COPY)\b\s*,?\s*/gi, "").replace(/\bLOCK\s*=\s*(NONE|SHARED|EXCLUSIVE)\b\s*,?\s*/gi, "");
+    sql = sql.replace(/,\s*,/g, ", ").replace(/,\s*$/g, "").replace(/\s{2,}/g, " ").trim();
+    return sql;
+  }
+  static buildDdlFallbackCandidates(stmt) {
+    const original = String(stmt);
+    const attempted = [];
+    if (/\bALGORITHM\s*=\s*INSTANT\b/i.test(original)) {
+      attempted.push({
+        stmt: original.replace(/\bALGORITHM\s*=\s*INSTANT\b/gi, "ALGORITHM=INPLACE"),
+        reason: "ALGORITHM=INSTANT \u2192 INPLACE"
+      });
+    }
+    const stripped = SyncTable.stripAlgorithmAndLock(original);
+    if (stripped !== original) {
+      attempted.push({ stmt: stripped, reason: "\u79FB\u9664 ALGORITHM/LOCK" });
+    }
+    const out = [];
+    for (const item of attempted) {
+      if (!item.stmt || item.stmt.trim() === "")
+        continue;
+      if (item.stmt === original)
+        continue;
+      if (out.some((x) => x.stmt === item.stmt))
+        continue;
+      out.push(item);
+    }
+    return out;
+  }
   static async executeDDLSafely(db, stmt) {
     try {
       await db.unsafe(stmt);
       return true;
     } catch (error) {
-      if (stmt.includes("ALGORITHM=INSTANT")) {
-        const inplaceSql = stmt.replace(/ALGORITHM=INSTANT/g, "ALGORITHM=INPLACE");
+      const candidates = SyncTable.buildDdlFallbackCandidates(stmt);
+      for (const candidate of candidates) {
         try {
-          await db.unsafe(inplaceSql);
+          await db.unsafe(candidate.stmt);
+          Logger.debug(`[DDL\u964D\u7EA7] ${candidate.reason}\uFF08\u5DF2\u6210\u529F\uFF09`);
           return true;
-        } catch {
-          let traditionSql = stmt;
-          traditionSql = traditionSql.replace(/\bALGORITHM\s*=\s*(INPLACE|INSTANT)\b\s*,?\s*/g, "").replace(/\bLOCK\s*=\s*(NONE|SHARED|EXCLUSIVE)\b\s*,?\s*/g, "");
-          traditionSql = traditionSql.replace(/,\s*,/g, ", ").replace(/,\s*$/g, "").replace(/\s{2,}/g, " ").trim();
-          await db.unsafe(traditionSql);
-          return true;
-        }
+        } catch {}
       }
       throw error;
     }
@@ -10205,6 +10232,9 @@ class SyncTable {
     }
     if (cBase === "varchar" && (nBase === "text" || nBase === "mediumtext" || nBase === "longtext"))
       return true;
+    if (cBase === "char" && nBase === "varchar" || cBase === "varchar" && nBase === "char") {
+      return true;
+    }
     return false;
   }
   static compareFieldDefinition(existingColumn, fieldDef) {
@@ -10335,12 +10365,17 @@ class SyncTable {
       return;
     const dropIndexActions = plan.indexActions.filter((a) => a.action === "drop");
     const createIndexActions = plan.indexActions.filter((a) => a.action === "create");
-    for (const act of dropIndexActions) {
-      const stmt = SyncTable.buildIndexSQL(tableName, act.indexName, act.fieldName, act.action);
+    if (dropIndexActions.length > 0) {
+      const dropClauses = [];
+      for (const act of dropIndexActions) {
+        dropClauses.push(SyncTable.buildIndexClause(act.indexName, act.fieldName, "drop"));
+      }
+      const tableQuoted = SyncTable.quoteIdentifier(tableName);
+      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INPLACE, LOCK=NONE, ${dropClauses.join(", ")}`;
       try {
-        await db.unsafe(stmt);
+        await SyncTable.executeDDLSafely(db, stmt);
       } catch (error) {
-        Logger.error({ err: error, table: tableName, index: act.indexName, field: act.fieldName, msg: "\u5220\u9664\u7D22\u5F15\u5931\u8D25" });
+        Logger.error({ err: error, table: tableName, msg: "\u6279\u91CF\u5220\u9664\u7D22\u5F15\u5931\u8D25" });
         throw error;
       }
     }
@@ -10355,12 +10390,17 @@ class SyncTable {
       const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INSTANT, LOCK=NONE, ${plan.defaultClauses.join(", ")}`;
       await SyncTable.executeDDLSafely(db, stmt);
     }
-    for (const act of createIndexActions) {
-      const stmt = SyncTable.buildIndexSQL(tableName, act.indexName, act.fieldName, act.action);
+    if (createIndexActions.length > 0) {
+      const createClauses = [];
+      for (const act of createIndexActions) {
+        createClauses.push(SyncTable.buildIndexClause(act.indexName, act.fieldName, "create"));
+      }
+      const tableQuoted = SyncTable.quoteIdentifier(tableName);
+      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INPLACE, LOCK=NONE, ${createClauses.join(", ")}`;
       try {
-        await db.unsafe(stmt);
+        await SyncTable.executeDDLSafely(db, stmt);
       } catch (error) {
-        Logger.error({ err: error, table: tableName, index: act.indexName, field: act.fieldName, msg: "\u521B\u5EFA\u7D22\u5F15\u5931\u8D25" });
+        Logger.error({ err: error, table: tableName, msg: "\u6279\u91CF\u521B\u5EFA\u7D22\u5F15\u5931\u8D25" });
         throw error;
       }
     }
@@ -10376,29 +10416,21 @@ class SyncTable {
         ) ENGINE=${ENGINE} DEFAULT CHARSET=${CHARSET} COLLATE=${COLLATE}`;
     await db.unsafe(createSQL);
     Logger.debug(`[\u8868 ${tableName}] + \u521B\u5EFA\u8868\uFF08\u7CFB\u7EDF\u5B57\u6BB5 + \u4E1A\u52A1\u5B57\u6BB5\uFF09`);
-    const indexTasks = [];
-    const existingIndexes = {};
+    const indexClauses = [];
     for (const sysField of systemIndexFields) {
       const indexName = `idx_${sysField}`;
-      if (existingIndexes[indexName]) {
-        continue;
-      }
-      const stmt = SyncTable.buildIndexSQL(tableName, indexName, sysField, "create");
-      indexTasks.push(db.unsafe(stmt));
+      indexClauses.push(SyncTable.buildIndexClause(indexName, sysField, "create"));
     }
     for (const [fieldKey, fieldDef] of Object.entries(fields)) {
       const dbFieldName = snakeCase(fieldKey);
       if (fieldDef.index === true && fieldDef.unique !== true) {
         const indexName = `idx_${dbFieldName}`;
-        if (existingIndexes[indexName]) {
-          continue;
-        }
-        const stmt = SyncTable.buildIndexSQL(tableName, indexName, dbFieldName, "create");
-        indexTasks.push(db.unsafe(stmt));
+        indexClauses.push(SyncTable.buildIndexClause(indexName, dbFieldName, "create"));
       }
     }
-    if (indexTasks.length > 0) {
-      await Promise.all(indexTasks);
+    if (indexClauses.length > 0) {
+      const stmt = `ALTER TABLE ${tableQuoted} ALGORITHM=INPLACE, LOCK=NONE, ${indexClauses.join(", ")}`;
+      await SyncTable.executeDDLSafely(db, stmt);
     }
   }
   static async modifyTable(db, dbName, tableName, fields) {
@@ -10429,11 +10461,19 @@ class SyncTable {
             const typeMapping = SyncTable.getTypeMapping();
             const expectedType = typeMapping[fieldDef.type]?.toLowerCase() || "";
             if (!SyncTable.isCompatibleTypeChange(currentType, expectedType)) {
-              const errorMsg = [`\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\u5176\u4ED6\u7C7B\u578B\u53D8\u66F4\u9700\u8981\u624B\u52A8\u5904\u7406"].join(`
+              const errorMsg = [`\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\uFF1B\u5176\u4ED6\u7C7B\u578B\u53D8\u66F4\u9700\u8981\u624B\u52A8\u5904\u7406"].join(`
 `);
               throw new Error(errorMsg);
             }
-            compatibleTypeChanges.push(`${dbFieldName}: ${currentType} -> ${expectedType}`);
+            let compatLabel = "";
+            if (currentType === "char" && expectedType === "varchar" || currentType === "varchar" && expectedType === "char") {
+              compatLabel = "char/varchar\u4E92\u8F6C";
+            }
+            if (compatLabel) {
+              compatibleTypeChanges.push(`${dbFieldName}: ${currentType} -> ${expectedType} (${compatLabel})`);
+            } else {
+              compatibleTypeChanges.push(`${dbFieldName}: ${currentType} -> ${expectedType}`);
+            }
           }
           if (defaultChanged) {
             const actualDefault = SyncTable.resolveDefaultValue(fieldDef.default ?? null, fieldDef.type);