adyxax/tfstated
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity

chore(tfstated): improve error messages and refactored PRAGMA code in the database module

Browse source
This commit is contained in:
Julien Dessaux 2024-11-28 00:11:11 +01:00
parent b3980358cf
commit 6cf7872b22
Signed by: adyxax
GPG key ID: F92E51B86E07177E
3 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
tfstated cover.out
tfstate.db tfstate.db
tfstate.db-shm tfstate.db-shm
tfstate.db-wal tfstate.db-wal

7
go.mod
View file

@ -2,9 +2,8 @@ module git.adyxax.org/adyxax/tfstated
go 1.23.3 go 1.23.3
require github.com/mattn/go-sqlite3 v1.14.24
require ( require (
go.n16f.net/uuid v0.0.0-20240707135755-e4fd26b968ad // indirect github.com/mattn/go-sqlite3 v1.14.24
golang.org/x/crypto v0.29.0 // indirect go.n16f.net/uuid v0.0.0-20240707135755-e4fd26b968ad
golang.org/x/crypto v0.29.0
) )

33
pkg/database/db.go
View file

@ -12,7 +12,7 @@ import (
func initDB(ctx context.Context, url string) (*sql.DB, error) { func initDB(ctx context.Context, url string) (*sql.DB, error) {
db, err := sql.Open("sqlite3", url) db, err := sql.Open("sqlite3", url)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to open database: %w", err)
} }
defer func() { defer func() {
if err != nil { if err != nil {
@ -20,7 +20,7 @@ func initDB(ctx context.Context, url string) (*sql.DB, error) {
} }
}() }()
if _, err = db.ExecContext(ctx, "PRAGMA busy_timeout = 5000"); err != nil { if _, err = db.ExecContext(ctx, "PRAGMA busy_timeout = 5000"); err != nil {
return nil, err return nil, fmt.Errorf("failed to set pragma: %w", err)
} }
return db, nil return db, nil
@ -37,7 +37,7 @@ type DB struct {
func NewDB(ctx context.Context, url string) (*DB, error) { func NewDB(ctx context.Context, url string) (*DB, error) {
readDB, err := initDB(ctx, url) readDB, err := initDB(ctx, url)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to init read database connection: %w", err)
} }
defer func() { defer func() {
if err != nil { if err != nil {
@ -48,7 +48,7 @@ func NewDB(ctx context.Context, url string) (*DB, error) {
writeDB, err := initDB(ctx, url) writeDB, err := initDB(ctx, url)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to init write database connection: %w", err)
} }
defer func() { defer func() {
if err != nil { if err != nil {
@ -63,20 +63,22 @@ func NewDB(ctx context.Context, url string) (*DB, error) {
versionsHistoryLimit: 64, versionsHistoryLimit: 64,
writeDB: writeDB, writeDB: writeDB,
} }
if _, err = db.Exec("PRAGMA foreign_keys = ON"); err != nil { pragmas := []struct {
return nil, err key string
value string
}{
{"foreign_keys", "ON"},
{"cache_size", "10000000"},
{"journal_mode", "WAL"},
{"synchronous", "NORMAL"},
} }
if _, err = db.Exec("PRAGMA cache_size = 10000000"); err != nil { for _, pragma := range pragmas {
return nil, err if _, err = db.Exec(fmt.Sprintf("PRAGMA %s = %s", pragma.key, pragma.value)); err != nil {
} return nil, fmt.Errorf("failed to set pragma: %w", err)
if _, err = db.Exec("PRAGMA journal_mode = WAL"); err != nil { }
return nil, err
}
if _, err = db.Exec("PRAGMA synchronous = NORMAL"); err != nil {
return nil, err
} }
if err = db.migrate(); err != nil { if err = db.migrate(); err != nil {
return nil, err return nil, fmt.Errorf("failed to migrate: %w", err)
} }
return &db, nil return &db, nil
@ -85,6 +87,7 @@ func NewDB(ctx context.Context, url string) (*DB, error) {
func (db *DB) Close() error { func (db *DB) Close() error {
if err := db.readDB.Close(); err != nil { if err := db.readDB.Close(); err != nil {
_ = db.writeDB.Close() _ = db.writeDB.Close()
return fmt.Errorf("failed to close read database connection: %w", err)
} }
return db.writeDB.Close() return db.writeDB.Close()
} }