dennis/freed
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverts back to old Connect style database access

Browse source
This commit is contained in:
Dennis Schoepf 2024-08-30 17:57:46 +02:00
parent 727a788d44
commit dd075aaf63
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/database/database.go
View file

@ -8,17 +8,15 @@ import (
migrate "github.com/rubenv/sql-migrate" migrate "github.com/rubenv/sql-migrate"
) )
var db *sql.DB
//go:embed migrations/* //go:embed migrations/*
var dbMigrations embed.FS var dbMigrations embed.FS
func Init(filename string) error { func Connect(path string) (*sql.DB, error) {
dbOptions := "?_fk=on&_journal=WAL&sync=normal" dbOptions := "?_fk=on&_journal=WAL&sync=normal"
db, err := sql.Open("sqlite3", filename+dbOptions) db, err := sql.Open("sqlite3", path+dbOptions)
if err != nil { if err != nil {
return err return nil, err
} }
migrations := migrate.EmbedFileSystemMigrationSource{ migrations := migrate.EmbedFileSystemMigrationSource{
@ -27,8 +25,12 @@ func Init(filename string) error {
} }
if _, err := migrate.Exec(db, "sqlite3", migrations, migrate.Up); err != nil { if _, err := migrate.Exec(db, "sqlite3", migrations, migrate.Up); err != nil {
return err return nil, err
} }
return db.Ping() if err := db.Ping(); err != nil {
return nil, err
}
return db, nil
} }