From d28be1b7117cfc0696f58167990b0b9fc78d2ce5 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 30 Apr 2025 14:34:49 -0500 Subject: [PATCH] fix: handle null database name in getGolderDB --- internal/db/sqlite/db_folderdb.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/db/sqlite/db_folderdb.go b/internal/db/sqlite/db_folderdb.go index 772d322f4..90e85d2ab 100644 --- a/internal/db/sqlite/db_folderdb.go +++ b/internal/db/sqlite/db_folderdb.go @@ -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 // 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(` SELECT database_name FROM folders 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) } + + var dbName string + if dbns.Valid { + dbName = dbns.String + } if dbName == "" && !create { return nil, errNoSuchFolder }