omicron/linkshare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REORDER ME into database

Browse Source
This commit is contained in:
omicron
2025-05-08 23:41:36 +02:00
parent 5145191c2b
commit 3d8af35a89
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/database/manager.go
View File

@ -63,7 +63,7 @@ func (db *DB) Close() error {
// Initialize the database schema // Initialize the database schema
func (db *DB) Initialize(schemaPath string) error { func (db *DB) Initialize(schemaPath string) error {
err := db.checkIsInitialized() err := db.CheckInitialized()
if err == nil { if err == nil {
return nil return nil
} }
@ -82,7 +82,8 @@ func (db *DB) Initialize(schemaPath string) error {
return nil return nil
} }
func (db *DB) checkIsInitialized() error { // CheckInitialized returns nil if the database is initialized and an error otherwise
func (db *DB) CheckInitialized() error {
var count int var count int
err := db.conn.QueryRow("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='settings'").Scan(&count) err := db.conn.QueryRow("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='settings'").Scan(&count)
if err != nil { if err != nil {
@ -95,7 +96,8 @@ func (db *DB) checkIsInitialized() error {
return nil return nil
} }
func (db *DB) getSchemaVersion() (int, error) { // GetSchemaVersion returns the schema version or an error
func (db *DB) GetSchemaVersion() (int, error) {
var version string var version string
err := db.conn.QueryRow("SELECT value FROM settings WHERE key='schema-version'").Scan(&version) err := db.conn.QueryRow("SELECT value FROM settings WHERE key='schema-version'").Scan(&version)
if err != nil { if err != nil {
@ -116,11 +118,11 @@ func (db *DB) getSchemaVersion() (int, error) {
// CheckSchemaVersion verifies that the schema is initialized and has the correct version // CheckSchemaVersion verifies that the schema is initialized and has the correct version
func (db *DB) CheckSchemaVersion() error { func (db *DB) CheckSchemaVersion() error {
err := db.checkIsInitialized() err := db.CheckInitialized()
if err != nil { if err != nil {
return err return err
} }
version_, err := db.getSchemaVersion() version_, err := db.GetSchemaVersion()
if err != nil { if err != nil {
return err return err
} }
@ -132,9 +134,7 @@ func (db *DB) CheckSchemaVersion() error {
return nil return nil
} }
// Transaction executes a function within a database transaction, func (db *DB) transaction(ctx context.Context, fn func(*sql.Tx) error) error {
// handling commit/rollback automatically.
func (db *DB) Transaction(ctx context.Context, fn func(*sql.Tx) error) error {
tx, err := db.conn.BeginTx(ctx, nil) tx, err := db.conn.BeginTx(ctx, nil)
if err != nil { if err != nil {
return fmt.Errorf("failed to begin transaction: %w", err) return fmt.Errorf("failed to begin transaction: %w", err)