From 55595954adbfc8797a0e973bb936f100ee9e6a67 Mon Sep 17 00:00:00 2001
From: Andras Banki-Horvath <bhandras@gmail.com>
Date: Mon, 17 Mar 2025 16:42:26 +0100
Subject: [PATCH] config: rename skip-sql-invoice-migration to
 skip-native-sql-migration

In future releases we will use this flag to make potentially failing kv
to native SQL migrations optional. For this reason it is better to
rename it to avoid confusion.
---
 config_builder.go                          | 2 +-
 docs/release-notes/release-notes-0.19.0.md | 4 ++++
 lncfg/db.go                                | 6 +++---
 sample-lnd.conf                            | 7 ++++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/config_builder.go b/config_builder.go
index bb9c1b320..5ddcca9be 100644
--- a/config_builder.go
+++ b/config_builder.go
@@ -1099,7 +1099,7 @@ func (d *DefaultDatabaseBuilder) BuildDatabase(
 		// run. If the database version is already above this custom
 		// migration's version (7), it will be skipped permanently,
 		// regardless of the flag.
-		if !d.cfg.DB.SkipSQLInvoiceMigration {
+		if !d.cfg.DB.SkipNativeSQLMigration {
 			migrationFn := func(tx *sqlc.Queries) error {
 				err := invoices.MigrateInvoicesToSQL(
 					ctx, dbs.ChanStateDB.Backend,
diff --git a/docs/release-notes/release-notes-0.19.0.md b/docs/release-notes/release-notes-0.19.0.md
index 2b1b1f6e7..b9a3e57dd 100644
--- a/docs/release-notes/release-notes-0.19.0.md
+++ b/docs/release-notes/release-notes-0.19.0.md
@@ -368,6 +368,10 @@ The underlying functionality between those two options remain the same.
   ](https://github.com/lightningnetwork/lnd/pull/9438) tombstone after native 
   SQL migration.
 
+* [Rename of skip migration
+  flag](https://github.com/lightningnetwork/lnd/pull/9606/) for future
+  compatibility.
+
 ## Code Health
 
 * A code refactor that [moves all the graph related DB code out of the 
diff --git a/lncfg/db.go b/lncfg/db.go
index bdeadb933..d6400eac5 100644
--- a/lncfg/db.go
+++ b/lncfg/db.go
@@ -87,7 +87,7 @@ type DB struct {
 
 	UseNativeSQL bool `long:"use-native-sql" description:"Use native SQL for tables that already support it."`
 
-	SkipSQLInvoiceMigration bool `long:"skip-sql-invoice-migration" description:"Do not migrate invoices stored in our key-value database to native SQL."`
+	SkipNativeSQLMigration bool `long:"skip-native-sql-migration" description:"Do not run the KV to native SQL migration. It should only be used if errors are encountered normally."`
 
 	NoGraphCache bool `long:"no-graph-cache" description:"Don't use the in-memory graph cache for path finding. Much slower but uses less RAM. Can only be used with a bolt database backend."`
 
@@ -117,8 +117,8 @@ func DefaultDB() *DB {
 			MaxConnections: defaultSqliteMaxConnections,
 			BusyTimeout:    defaultSqliteBusyTimeout,
 		},
-		UseNativeSQL:            false,
-		SkipSQLInvoiceMigration: false,
+		UseNativeSQL:           false,
+		SkipNativeSQLMigration: false,
 	}
 }
 
diff --git a/sample-lnd.conf b/sample-lnd.conf
index f3123a0d7..e00c80176 100644
--- a/sample-lnd.conf
+++ b/sample-lnd.conf
@@ -1478,9 +1478,10 @@
 ; own risk.
 ; db.use-native-sql=false
 
-; If set to true, native SQL invoice migration will be skipped. Note that this
-; option is intended for users who experience non-resolvable migration errors.
-; db.skip-sql-invoice-migration=false
+; If set to true, the KV to native SQL migration will be skipped. Note that
+; this option is intended for users who experience non-resolvable migration
+; errors.
+; db.skip-native-sql-migration=false
 
 [etcd]