mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 20:34:37 +03:00
Close database after migrating. Add reset errors (#215)
This commit is contained in:
@@ -2,6 +2,7 @@ package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"regexp"
|
||||
@@ -38,10 +39,20 @@ func Initialize(databasePath string) {
|
||||
DB = conn
|
||||
}
|
||||
|
||||
func Reset(databasePath string) {
|
||||
_ = DB.Close()
|
||||
_ = os.Remove(databasePath)
|
||||
func Reset(databasePath string) error {
|
||||
err := DB.Close()
|
||||
|
||||
if err != nil {
|
||||
return errors.New("Error closing database: " + err.Error())
|
||||
}
|
||||
|
||||
err = os.Remove(databasePath)
|
||||
if err != nil {
|
||||
return errors.New("Error removing database: " + err.Error())
|
||||
}
|
||||
|
||||
Initialize(databasePath)
|
||||
return nil
|
||||
}
|
||||
|
||||
// Migrate the database
|
||||
@@ -71,6 +82,7 @@ func runMigrations(databasePath string) {
|
||||
panic(err.Error())
|
||||
}
|
||||
}
|
||||
m.Close()
|
||||
}
|
||||
|
||||
func registerRegexpFunc() {
|
||||
|
||||
Reference in New Issue
Block a user