felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix: handle null database name in getGolderDB

Browse Source
This commit is contained in:
Jakob Borg
2025-04-30 14:34:53 -05:00
parent 47e3147d0b
commit d930531744
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/db/sqlite/db_folderdb.go
+7 -2
View File
@@ -35,13 +35,18 @@ func (s *DB) getFolderDB(folder string, create bool) (*folderDB, error) {
// Check for an existing database. If we're not supposed to create the // Check for an existing database. If we're not supposed to create the
// folder, we don't move on if it doesn't already have a database name. // folder, we don't move on if it doesn't already have a database name.
var dbName string var dbns sql.NullString
if err := s.stmt(` if err := s.stmt(`
SELECT database_name FROM folders SELECT database_name FROM folders
WHERE folder_id = ? WHERE folder_id = ?
`).Get(&dbName, folder); err != nil && !errors.Is(err, sql.ErrNoRows) { `).Get(&dbns, folder); err != nil && !errors.Is(err, sql.ErrNoRows) {
return nil, wrap(err) return nil, wrap(err)
} }
var dbName string
if dbns.Valid {
dbName = dbns.String
}
if dbName == "" && !create { if dbName == "" && !create {
return nil, errNoSuchFolder return nil, errNoSuchFolder
} }