From 96b8ddc077eaaa783e6e6496652ba3d18f1152ea Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Sun, 12 Jul 2026 15:38:28 +0800
Subject: [PATCH] fix(migrator): only import zone domains during upgrade window
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Zone 历史导入仅在 goose 版本位于 [202607120002, 202607130001) 时执行，
phase-2 删列完成后日常启动不再进入导入逻辑。
---
 internal/db/migrator/migrator.go | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/internal/db/migrator/migrator.go b/internal/db/migrator/migrator.go
index a3860269..d42793f8 100644
--- a/internal/db/migrator/migrator.go
+++ b/internal/db/migrator/migrator.go
@@ -36,8 +36,10 @@ const (
 	dialectSqlite   = "sqlite3"
 	dialectPostgres = "postgres"
 	// zoneImportSQLVersion is the goose SQL marker after of_zones creation and
-	// before drop of legacy route domain columns. Zone data import runs here.
-	zoneImportSQLVersion int64 = 202607120002
+	// before drop of legacy route domain columns. Zone data import runs only
+	// while DB version is in [zoneImportSQLVersion, zoneDropLegacySQLVersion).
+	zoneImportSQLVersion     int64 = 202607120002
+	zoneDropLegacySQLVersion int64 = 202607130001
 )
 
 func gooseDialect() string {
@@ -77,8 +79,10 @@ func Migrate() {
 	if err := goose.UpTo(sqlDB, migrationDir(), zoneImportSQLVersion); err != nil {
 		log.Fatalf("[%s] goose migrate (up to zone import) failed: %v\n", dbType(), err)
 	}
-	// 2) Auto-import legacy domains (publicsuffix; idempotent; no-op after phase-2 drop).
-	if err := importZoneDomainsAfterGoose(sqlDB); err != nil {
+	// 2) Import legacy domains only during the one-time upgrade window:
+	//    version in [202607120002, 202607130001). After phase-2 drop is applied,
+	//    this is skipped on every subsequent startup.
+	if err := maybeImportZoneDomains(sqlDB); err != nil {
 		log.Fatalf("[%s] zone domain import failed: %v\n", dbType(), err)
 	}
 	// 3) Remaining SQL (drop legacy columns / managed_domains, later migrations).
@@ -91,9 +95,18 @@ func Migrate() {
 	log.Printf("[%s] goose migrate success\n", dbType())
 }
 
-// importZoneDomainsAfterGoose 在 SQL 迁移完成后自动导入旧路由/托管域名。
-// 必须使用 publicsuffix 解析注册根域，故不能放在纯 SQL 中；幂等且在旧列删除后为空操作。
-func importZoneDomainsAfterGoose(sqlDB *sql.DB) error {
+// maybeImportZoneDomains runs legacy→Zone import only when the DB is still in the
+// pre-drop upgrade window. After 202607130001 is applied, this is a no-op and is
+// not executed on normal restarts.
+func maybeImportZoneDomains(sqlDB *sql.DB) error {
+	version, err := goose.GetDBVersion(sqlDB)
+	if err != nil {
+		return fmt.Errorf("get goose db version: %w", err)
+	}
+	if version < zoneImportSQLVersion || version >= zoneDropLegacySQLVersion {
+		return nil
+	}
+
 	ctx := context.Background()
 	tx, err := sqlDB.BeginTx(ctx, nil)
 	if err != nil {