Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some cosmetic fixes from #4106 (#4236)

Browse Source
This commit is contained in:
its-josh4
2023-10-22 14:20:41 -07:00
committed by GitHub
parent 24984da16e
commit b99d16b712
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/sqlite/database.go
View File

@@ -145,7 +145,7 @@ func (db *Database) Open(dbPath string) error {
if databaseSchemaVersion == 0 {
// new database, just run the migrations
if err := db.RunMigrations(); err != nil {
return fmt.Errorf("error running initial schema migrations: %v", err)
return fmt.Errorf("error running initial schema migrations: %w", err)
}
} else {
if databaseSchemaVersion > appSchemaVersion {
@@ -241,12 +241,12 @@ func (db *Database) Remove() error {
err := db.Close()
if err != nil {
return errors.New("Error closing database: " + err.Error())
return fmt.Errorf("error closing database: %w", err)
}
err = os.Remove(databasePath)
if err != nil {
return errors.New("Error removing database: " + err.Error())
return fmt.Errorf("error removing database: %w", err)
}
// remove the -shm, -wal files ( if they exist )
@@ -255,7 +255,7 @@ func (db *Database) Remove() error {
if exists, _ := fsutil.FileExists(wf); exists {
err = os.Remove(wf)
if err != nil {
return errors.New("Error removing database: " + err.Error())
return fmt.Errorf("error removing database: %w", err)
}
}
}
@@ -278,21 +278,20 @@ func (db *Database) Reset() error {
// Backup the database. If db is nil, then uses the existing database
// connection.
func (db *Database) Backup(backupPath string) error {
func (db *Database) Backup(backupPath string) (err error) {
thisDB := db.db
if thisDB == nil {
var err error
thisDB, err = sqlx.Connect(sqlite3Driver, "file:"+db.dbPath+"?_fk=true")
if err != nil {
return fmt.Errorf("open database %s failed: %v", db.dbPath, err)
return fmt.Errorf("open database %s failed: %w", db.dbPath, err)
}
defer thisDB.Close()
}
logger.Infof("Backing up database into: %s", backupPath)
_, err := thisDB.Exec(`VACUUM INTO "` + backupPath + `"`)
_, err = thisDB.Exec(`VACUUM INTO "` + backupPath + `"`)
if err != nil {
return fmt.Errorf("vacuum failed: %v", err)
return fmt.Errorf("vacuum failed: %w", err)
}
return nil