firewalldb: add SQLMig6Queries to firewalldb

Add the `sqlcmig6` defintion of the the firewalldb queries to the
firewalldb package, along with a transaction executor that uses those
queries.

Note that while the standard Queiries interface, that use the standard
sqlc queries, may change, the `SQLMig6Queries` interface is intended to
remain the same.

Author: ViktorTigerstrom

firewalldb/actions_sql.go

@@ -10,6 +10,7 @@ import (
 	"github.com/lightninglabs/lightning-terminal/accounts"
 	"github.com/lightninglabs/lightning-terminal/db"
 	"github.com/lightninglabs/lightning-terminal/db/sqlc"
+	"github.com/lightninglabs/lightning-terminal/db/sqlcmig6"
 	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/sqldb/v2"
@@ -22,6 +23,13 @@ type SQLAccountQueries interface {
 	GetAccountIDByAlias(ctx context.Context, alias int64) (int64, error)
 }
 
+// SQLMig6AccountQueries is a subset of the sqlcmig6.Queries interface that can
+// be used to interact with the accounts table.
+type SQLMig6AccountQueries interface {
+	GetAccount(ctx context.Context, id int64) (sqlcmig6.Account, error)
+	GetAccountIDByAlias(ctx context.Context, alias int64) (int64, error)
+}
+
 // SQLActionQueries is a subset of the sqlc.Queries interface that can be used
 // to interact with action related tables.
 //
@@ -36,6 +44,20 @@ type SQLActionQueries interface {
 	CountActions(ctx context.Context, arg sqlc.ActionQueryParams) (int64, error)
 }
 
+// SQLMig6ActionQueries is a subset of the sqlcmig6.Queries interface that can
+// be used to interact with action related tables.
+//
+//nolint:lll
+type SQLMig6ActionQueries interface {
+	SQLSessionQueries
+	SQLMig6AccountQueries
+
+	InsertAction(ctx context.Context, arg sqlcmig6.InsertActionParams) (int64, error)
+	SetActionState(ctx context.Context, arg sqlcmig6.SetActionStateParams) error
+	ListActions(ctx context.Context, arg sqlcmig6.ListActionsParams) ([]sqlcmig6.Action, error)
+	CountActions(ctx context.Context, arg sqlcmig6.ActionQueryParams) (int64, error)
+}
+
 // sqlActionLocator helps us find an action in the SQL DB.
 type sqlActionLocator struct {
 	// id is the DB level ID of the action.

firewalldb/kvstores_sql.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/lightninglabs/lightning-terminal/db"
 	"github.com/lightninglabs/lightning-terminal/db/sqlc"
+	"github.com/lightninglabs/lightning-terminal/db/sqlcmig6"
 	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/sqldb/v2"
@@ -39,6 +40,31 @@ type SQLKVStoreQueries interface {
 	GetRuleID(ctx context.Context, name string) (int64, error)
 }
 
+// SQLMig6KVStoreQueries is a subset of the sqlcmig6.Queries interface that can
+// be used to interact with the kvstore tables.
+//
+//nolint:lll
+type SQLMig6KVStoreQueries interface {
+	SQLSessionQueries
+
+	DeleteFeatureKVStoreRecord(ctx context.Context, arg sqlcmig6.DeleteFeatureKVStoreRecordParams) error
+	DeleteGlobalKVStoreRecord(ctx context.Context, arg sqlcmig6.DeleteGlobalKVStoreRecordParams) error
+	DeleteGroupKVStoreRecord(ctx context.Context, arg sqlcmig6.DeleteGroupKVStoreRecordParams) error
+	GetFeatureKVStoreRecord(ctx context.Context, arg sqlcmig6.GetFeatureKVStoreRecordParams) ([]byte, error)
+	GetGlobalKVStoreRecord(ctx context.Context, arg sqlcmig6.GetGlobalKVStoreRecordParams) ([]byte, error)
+	GetGroupKVStoreRecord(ctx context.Context, arg sqlcmig6.GetGroupKVStoreRecordParams) ([]byte, error)
+	UpdateFeatureKVStoreRecord(ctx context.Context, arg sqlcmig6.UpdateFeatureKVStoreRecordParams) error
+	UpdateGlobalKVStoreRecord(ctx context.Context, arg sqlcmig6.UpdateGlobalKVStoreRecordParams) error
+	UpdateGroupKVStoreRecord(ctx context.Context, arg sqlcmig6.UpdateGroupKVStoreRecordParams) error
+	InsertKVStoreRecord(ctx context.Context, arg sqlcmig6.InsertKVStoreRecordParams) error
+	ListAllKVStoresRecords(ctx context.Context) ([]sqlcmig6.Kvstore, error)
+	DeleteAllTempKVStores(ctx context.Context) error
+	GetOrInsertFeatureID(ctx context.Context, name string) (int64, error)
+	GetOrInsertRuleID(ctx context.Context, name string) (int64, error)
+	GetFeatureID(ctx context.Context, name string) (int64, error)
+	GetRuleID(ctx context.Context, name string) (int64, error)
+}
+
 // DeleteTempKVStores deletes all temporary kv stores.
 //
 // NOTE: part of the RulesDB interface.

firewalldb/privacy_mapper_sql.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 
 	"github.com/lightninglabs/lightning-terminal/db/sqlc"
+	"github.com/lightninglabs/lightning-terminal/db/sqlcmig6"
 	"github.com/lightninglabs/lightning-terminal/session"
 )
 
@@ -22,6 +23,19 @@ type SQLPrivacyPairQueries interface {
 	GetRealForPseudo(ctx context.Context, arg sqlc.GetRealForPseudoParams) (string, error)
 }
 
+// SQLMig6PrivacyPairQueries is a subset of the sqlcmig6.Queries interface that
+// can be used to interact with the privacy map table.
+//
+//nolint:lll
+type SQLMig6PrivacyPairQueries interface {
+	SQLSessionQueries
+
+	InsertPrivacyPair(ctx context.Context, arg sqlcmig6.InsertPrivacyPairParams) error
+	GetAllPrivacyPairs(ctx context.Context, groupID int64) ([]sqlcmig6.GetAllPrivacyPairsRow, error)
+	GetPseudoForReal(ctx context.Context, arg sqlcmig6.GetPseudoForRealParams) (string, error)
+	GetRealForPseudo(ctx context.Context, arg sqlcmig6.GetRealForPseudoParams) (string, error)
+}
+
 // PrivacyDB constructs a PrivacyMapDB that will be indexed under the given
 // group ID key.
 //

firewalldb/sql_store.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/lightninglabs/lightning-terminal/db"
 	"github.com/lightninglabs/lightning-terminal/db/sqlc"
+	"github.com/lightninglabs/lightning-terminal/db/sqlcmig6"
 	"github.com/lightningnetwork/lnd/clock"
 	"github.com/lightningnetwork/lnd/sqldb/v2"
 )
@@ -27,6 +28,16 @@ type SQLQueries interface {
 	SQLActionQueries
 }
 
+// SQLMig6Queries is a subset of the sqlcmig6.Queries interface that can be used
+// to interact with various firewalldb tables.
+type SQLMig6Queries interface {
+	sqldb.BaseQuerier
+
+	SQLMig6KVStoreQueries
+	SQLMig6PrivacyPairQueries
+	SQLMig6ActionQueries
+}
+
 // BatchedSQLQueries combines the SQLQueries interface with the BatchedTx
 // interface, allowing for multiple queries to be executed in single SQL
 // transaction.
@@ -68,6 +79,26 @@ func NewSQLQueriesExecutor(baseDB *sqldb.BaseDB,
 	}
 }
 
+type SQLMig6QueriesExecutor[T sqldb.BaseQuerier] struct {
+	*sqldb.TransactionExecutor[T]
+
+	SQLMig6Queries
+}
+
+func NewSQLMig6QueriesExecutor(baseDB *sqldb.BaseDB,
+	queries *sqlcmig6.Queries) *SQLMig6QueriesExecutor[SQLMig6Queries] {
+
+	executor := sqldb.NewTransactionExecutor(
+		baseDB, func(tx *sql.Tx) SQLMig6Queries {
+			return queries.WithTx(tx)
+		},
+	)
+	return &SQLMig6QueriesExecutor[SQLMig6Queries]{
+		TransactionExecutor: executor,
+		SQLMig6Queries:      queries,
+	}
+}
+
 // A compile-time assertion to ensure that SQLDB implements the RulesDB
 // interface.
 var _ RulesDB = (*SQLDB)(nil)