From 647fa9ab94a55dea083bb3c11518b692003cbb52 Mon Sep 17 00:00:00 2001 From: matevip Date: Mon, 6 Apr 2026 12:37:12 +0800 Subject: [PATCH] fix(guard): check column existence before ALTER TABLE to suppress H2 duplicate column errors --- .../config/ToolGuardSchemaMigration.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mateclaw-server/src/main/java/vip/mate/tool/guard/config/ToolGuardSchemaMigration.java b/mateclaw-server/src/main/java/vip/mate/tool/guard/config/ToolGuardSchemaMigration.java index 19f736f5..8b354bb4 100644 --- a/mateclaw-server/src/main/java/vip/mate/tool/guard/config/ToolGuardSchemaMigration.java +++ b/mateclaw-server/src/main/java/vip/mate/tool/guard/config/ToolGuardSchemaMigration.java @@ -113,12 +113,26 @@ public class ToolGuardSchemaMigration implements ApplicationRunner { * 为 mate_tool_guard_config 补充审计配置列（向已有表兼容迁移） */ private void migrateGuardConfigAuditColumns() { - safeExecute("ALTER TABLE mate_tool_guard_config ADD COLUMN audit_enabled BOOLEAN NOT NULL DEFAULT TRUE"); - safeExecute("ALTER TABLE mate_tool_guard_config ADD COLUMN audit_min_severity VARCHAR(16) NOT NULL DEFAULT 'INFO'"); - safeExecute("ALTER TABLE mate_tool_guard_config ADD COLUMN audit_retention_days INT NOT NULL DEFAULT 90"); + safeAddColumn("mate_tool_guard_config", "audit_enabled", "BOOLEAN NOT NULL DEFAULT TRUE"); + safeAddColumn("mate_tool_guard_config", "audit_min_severity", "VARCHAR(16) NOT NULL DEFAULT 'INFO'"); + safeAddColumn("mate_tool_guard_config", "audit_retention_days", "INT NOT NULL DEFAULT 90"); log.info("[ToolGuardSchemaMigration] audit columns migration done"); } + private void safeAddColumn(String table, String column, String definition) { + try { + Integer count = jdbcTemplate.queryForObject( + "SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?", + Integer.class, table.toUpperCase(), column.toUpperCase()); + if (count != null && count > 0) { + return; + } + jdbcTemplate.execute("ALTER TABLE " + table + " ADD COLUMN " + column + " " + definition); + } catch (Exception e) { + log.debug("[ToolGuardSchemaMigration] Column migration skipped: {}", e.getMessage()); + } + } + private void safeExecute(String sql) { try { jdbcTemplate.execute(sql);