firewalldb: use sqlcmig6 for kvdb to sql migration

Author: ViktorTigerstrom

firewalldb/sql_migration.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/lightninglabs/lightning-terminal/db/sqlc"
+	"github.com/lightninglabs/lightning-terminal/db/sqlcmig6"
 	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/sqldb"
 	"go.etcd.io/bbolt"
@@ -78,7 +78,7 @@ func (e *kvEntry) namespacedKey() string {
 // NOTE: As sessions may contain linked sessions and accounts, the sessions and
 // accounts sql migration MUST be run prior to this migration.
 func MigrateFirewallDBToSQL(ctx context.Context, kvStore *bbolt.DB,
-	sqlTx SQLQueries) error {
+	sqlTx SQLMig6Queries) error {
 
 	log.Infof("Starting migration of the rules DB to SQL")
 
@@ -99,7 +99,7 @@ func MigrateFirewallDBToSQL(ctx context.Context, kvStore *bbolt.DB,
 // database to the SQL database. The function also asserts that the
 // migrated values match the original values in the KV store.
 func migrateKVStoresDBToSQL(ctx context.Context, kvStore *bbolt.DB,
-	sqlTx SQLQueries) error {
+	sqlTx SQLMig6Queries) error {
 
 	log.Infof("Starting migration of the KV stores to SQL")
 
@@ -361,15 +361,15 @@ func collectKVPairs(bkt *bbolt.Bucket, errorOnBuckets, perm bool,
 }
 
 // insertPair inserts a single key-value pair into the SQL database.
-func insertPair(ctx context.Context, tx SQLQueries,
+func insertPair(ctx context.Context, tx SQLMig6Queries,
 	entry *kvEntry) (*sqlKvEntry, error) {
 
 	ruleID, err := tx.GetOrInsertRuleID(ctx, entry.ruleName)
 	if err != nil {
 		return nil, err
 	}
 
-	p := sqlc.InsertKVStoreRecordParams{
+	p := sqlcmig6.InsertKVStoreRecordParams{
 		Perm:     entry.perm,
 		RuleID:   ruleID,
 		EntryKey: entry.key,
@@ -421,13 +421,13 @@ func insertPair(ctx context.Context, tx SQLQueries,
 
 // getSQLValue retrieves the key value for the given kvEntry from the SQL
 // database.
-func getSQLValue(ctx context.Context, tx SQLQueries,
+func getSQLValue(ctx context.Context, tx SQLMig6Queries,
 	entry *sqlKvEntry) ([]byte, error) {
 
 	switch {
 	case entry.featureID.Valid && entry.groupID.Valid:
 		return tx.GetFeatureKVStoreRecord(
-			ctx, sqlc.GetFeatureKVStoreRecordParams{
+			ctx, sqlcmig6.GetFeatureKVStoreRecordParams{
 				Perm:      entry.perm,
 				RuleID:    entry.ruleID,
 				GroupID:   entry.groupID,
@@ -437,7 +437,7 @@ func getSQLValue(ctx context.Context, tx SQLQueries,
 		)
 	case entry.groupID.Valid:
 		return tx.GetGroupKVStoreRecord(
-			ctx, sqlc.GetGroupKVStoreRecordParams{
+			ctx, sqlcmig6.GetGroupKVStoreRecordParams{
 				Perm:    entry.perm,
 				RuleID:  entry.ruleID,
 				GroupID: entry.groupID,
@@ -446,7 +446,7 @@ func getSQLValue(ctx context.Context, tx SQLQueries,
 		)
 	case !entry.featureID.Valid && !entry.groupID.Valid:
 		return tx.GetGlobalKVStoreRecord(
-			ctx, sqlc.GetGlobalKVStoreRecordParams{
+			ctx, sqlcmig6.GetGlobalKVStoreRecordParams{
 				Perm:   entry.perm,
 				RuleID: entry.ruleID,
 				Key:    entry.key,

firewalldb/sql_migration_test.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/lightning-terminal/accounts"
-	"github.com/lightninglabs/lightning-terminal/db/sqlc"
+	"github.com/lightninglabs/lightning-terminal/db/sqlcmig6"
 	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightningnetwork/lnd/clock"
 	"github.com/lightningnetwork/lnd/fn"
@@ -53,24 +53,24 @@ func TestFirewallDBMigration(t *testing.T) {
 	}
 
 	makeSQLDB := func(t *testing.T,
-		sessionsStore session.Store) *SQLQueriesExecutor[SQLQueries] {
+		sStore session.Store) *SQLMig6QueriesExecutor[SQLMig6Queries] {
 
-		testDBStore := NewTestDBWithSessions(t, sessionsStore, clock)
+		testDBStore := NewTestDBWithSessions(t, sStore, clock)
 
 		store, ok := testDBStore.(*SQLDB)
 		require.True(t, ok)
 
 		baseDB := store.BaseDB
 
-		queries := sqlc.NewForType(baseDB, baseDB.BackendType)
+		queries := sqlcmig6.NewForType(baseDB, baseDB.BackendType)
 
-		return NewSQLQueriesExecutor(baseDB, queries)
+		return NewSQLMig6QueriesExecutor(baseDB, queries)
 	}
 
 	// The assertMigrationResults function will currently assert that
 	// the migrated kv stores entries in the SQLDB match the original kv
 	// stores entries in the BoltDB.
-	assertMigrationResults := func(t *testing.T, store SQLQueries,
+	assertMigrationResults := func(t *testing.T, store SQLMig6Queries,
 		kvEntries []*kvEntry) {
 
 		var (
@@ -141,7 +141,7 @@ func TestFirewallDBMigration(t *testing.T) {
 			if entry.groupAlias.IsNone() {
 				sqlVal, err := store.GetGlobalKVStoreRecord(
 					ctx,
-					sqlc.GetGlobalKVStoreRecordParams{
+					sqlcmig6.GetGlobalKVStoreRecordParams{
 						Key:    entry.key,
 						Perm:   entry.perm,
 						RuleID: ruleID,
@@ -159,7 +159,7 @@ func TestFirewallDBMigration(t *testing.T) {
 
 				v, err := store.GetGroupKVStoreRecord(
 					ctx,
-					sqlc.GetGroupKVStoreRecordParams{
+					sqlcmig6.GetGroupKVStoreRecordParams{
 						Key:    entry.key,
 						Perm:   entry.perm,
 						RuleID: ruleID,
@@ -184,7 +184,7 @@ func TestFirewallDBMigration(t *testing.T) {
 
 				sqlVal, err := store.GetFeatureKVStoreRecord(
 					ctx,
-					sqlc.GetFeatureKVStoreRecordParams{
+					sqlcmig6.GetFeatureKVStoreRecordParams{
 						Key:    entry.key,
 						Perm:   entry.perm,
 						RuleID: ruleID,
@@ -296,7 +296,7 @@ func TestFirewallDBMigration(t *testing.T) {
 			// sqldb v2 is based on the latest version of lnd/sqldb.
 			var opts sqldb.MigrationTxOptions
 			err = txEx.ExecTx(ctx, &opts,
-				func(tx SQLQueries) error {
+				func(tx SQLMig6Queries) error {
 					err = MigrateFirewallDBToSQL(
 						ctx, firewallStore.DB, tx,
 					)