From aa3f67281b039de737bb18b4a913f9703c71a5a8 Mon Sep 17 00:00:00 2001 From: Tim Wundenberg Date: Tue, 30 Jul 2024 13:03:49 +0200 Subject: [PATCH] fix closed database --- api/main.go | 10 ++++++++-- api/src/utils/db.go | 15 +-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/api/main.go b/api/main.go index 7d6ee1e..467951a 100644 --- a/api/main.go +++ b/api/main.go @@ -15,7 +15,13 @@ import ( func main() { log.Println("Starting server...") - db := utils.InitializeDB() + db, err := sql.Open("sqlite3", "./data.db") + if err != nil { + log.Fatal("Could not open Database data.db: ", err) + } + defer db.Close() + + utils.RunMigrations(db) var router = getRouter(db) @@ -25,7 +31,7 @@ func main() { } log.Println("Starting server at", server.Addr) - err := server.ListenAndServe() + err = server.ListenAndServe() if err != nil { panic(err) } diff --git a/api/src/utils/db.go b/api/src/utils/db.go index af2b728..f105f88 100644 --- a/api/src/utils/db.go +++ b/api/src/utils/db.go @@ -9,20 +9,7 @@ import ( _ "github.com/golang-migrate/migrate/v4/source/file" ) -func InitializeDB() *sql.DB { - - db, err := sql.Open("sqlite3", "./data.db") - if err != nil { - log.Fatal("Could not open Database data.db: ", err) - } - defer db.Close() - - runMigrations(db) - - return db -} - -func runMigrations(db *sql.DB) { +func RunMigrations(db *sql.DB) { driver, err := sqlite3.WithInstance(db, &sqlite3.Config{}) if err != nil { log.Fatal(err)