diff options
Diffstat (limited to 'internal/store')
| -rw-r--r-- | internal/store/sqlite.go | 36 | ||||
| -rw-r--r-- | internal/store/sqlite_test.go | 22 |
2 files changed, 29 insertions, 29 deletions
diff --git a/internal/store/sqlite.go b/internal/store/sqlite.go index c5c52a4..a9a0597 100644 --- a/internal/store/sqlite.go +++ b/internal/store/sqlite.go @@ -151,7 +151,7 @@ func (s *Store) SaveTasks(tasks []models.Task) error { if err != nil { return err } - defer tx.Rollback() + defer func() { _ = tx.Rollback() }() // Clear existing tasks first to remove stale data if _, err := tx.Exec(`DELETE FROM tasks`); err != nil { @@ -166,7 +166,7 @@ func (s *Store) SaveTasks(tasks []models.Task) error { if err != nil { return err } - defer stmt.Close() + defer func() { _ = stmt.Close() }() for _, task := range tasks { labelsJSON, _ := json.Marshal(task.Labels) @@ -201,7 +201,7 @@ func (s *Store) GetTasks() ([]models.Task, error) { if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() return scanTasks(rows) } @@ -243,13 +243,13 @@ func (s *Store) DeleteTasksByIDs(ids []string) error { if err != nil { return err } - defer tx.Rollback() + defer func() { _ = tx.Rollback() }() stmt, err := tx.Prepare(`DELETE FROM tasks WHERE id = ?`) if err != nil { return err } - defer stmt.Close() + defer func() { _ = stmt.Close() }() for _, id := range ids { if _, err := stmt.Exec(id); err != nil { @@ -267,7 +267,7 @@ func (s *Store) SaveMeals(meals []models.Meal) error { if err != nil { return err } - defer tx.Rollback() + defer func() { _ = tx.Rollback() }() stmt, err := tx.Prepare(` INSERT OR REPLACE INTO meals @@ -277,7 +277,7 @@ func (s *Store) SaveMeals(meals []models.Meal) error { if err != nil { return err } - defer stmt.Close() + defer func() { _ = stmt.Close() }() for _, meal := range meals { _, err := stmt.Exec( @@ -312,7 +312,7 @@ func (s *Store) GetMeals(startDate, endDate time.Time) ([]models.Meal, error) { if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() var meals []models.Meal for rows.Next() { @@ -391,7 +391,7 @@ func (s *Store) SaveBoards(boards []models.Board) error { if err != nil { return err } - defer tx.Rollback() + defer func() { _ = tx.Rollback() }() // Clear existing data first (cards must be deleted before boards due to foreign key) if _, err := tx.Exec(`DELETE FROM cards`); err != nil { @@ -409,7 +409,7 @@ func (s *Store) SaveBoards(boards []models.Board) error { if err != nil { return err } - defer boardStmt.Close() + defer func() { _ = boardStmt.Close() }() // Save cards cardStmt, err := tx.Prepare(` @@ -420,7 +420,7 @@ func (s *Store) SaveBoards(boards []models.Board) error { if err != nil { return err } - defer cardStmt.Close() + defer func() { _ = cardStmt.Close() }() savedBoards := 0 savedCards := 0 @@ -472,7 +472,7 @@ func (s *Store) GetBoards() ([]models.Board, error) { if err != nil { return nil, err } - defer boardRows.Close() + defer func() { _ = boardRows.Close() }() var boards []models.Board boardMap := make(map[string]int) // Store index, not pointer @@ -501,7 +501,7 @@ func (s *Store) GetBoards() ([]models.Board, error) { if err != nil { return nil, err } - defer cardRows.Close() + defer func() { _ = cardRows.Close() }() for cardRows.Next() { var card models.Card @@ -596,7 +596,7 @@ func (s *Store) GetBugs() ([]Bug, error) { if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() var bugs []Bug for rows.Next() { @@ -619,7 +619,7 @@ func (s *Store) GetUnresolvedBugs() ([]Bug, error) { if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() var bugs []Bug for rows.Next() { @@ -665,7 +665,7 @@ func (s *Store) GetUserShoppingItems() ([]UserShoppingItem, error) { if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() var items []UserShoppingItem for rows.Next() { @@ -701,7 +701,7 @@ func (s *Store) GetTasksByDateRange(start, end time.Time) ([]models.Task, error) if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() return scanTasks(rows) } @@ -722,7 +722,7 @@ func (s *Store) GetCardsByDateRange(start, end time.Time) ([]models.Card, error) if err != nil { return nil, err } - defer rows.Close() + defer func() { _ = rows.Close() }() var cards []models.Card for rows.Next() { diff --git a/internal/store/sqlite_test.go b/internal/store/sqlite_test.go index fc8a3b7..9aef09d 100644 --- a/internal/store/sqlite_test.go +++ b/internal/store/sqlite_test.go @@ -125,7 +125,7 @@ func setupTestStoreWithMeals(t *testing.T) *Store { // TestDeleteTask verifies that DeleteTask removes a task from the cache func TestDeleteTask(t *testing.T) { store := setupTestStoreWithTasks(t) - defer store.Close() + defer func() { _ = store.Close() }() // Save some tasks tasks := []models.Task{ @@ -213,7 +213,7 @@ func TestDeleteTask(t *testing.T) { // TestDeleteTask_NonExistent verifies that deleting a non-existent task doesn't error func TestDeleteTask_NonExistent(t *testing.T) { store := setupTestStoreWithTasks(t) - defer store.Close() + defer func() { _ = store.Close() }() // Delete a task that doesn't exist - should not error err := store.DeleteTask("nonexistent") @@ -225,7 +225,7 @@ func TestDeleteTask_NonExistent(t *testing.T) { // TestDeleteCard verifies that DeleteCard removes a card from the cache func TestDeleteCard(t *testing.T) { store := setupTestStoreWithCards(t) - defer store.Close() + defer func() { _ = store.Close() }() // First create a board _, err := store.db.Exec(`INSERT INTO boards (id, name) VALUES (?, ?)`, "board1", "Test Board") @@ -292,7 +292,7 @@ func TestDeleteCard(t *testing.T) { // TestDeleteCard_NonExistent verifies that deleting a non-existent card doesn't error func TestDeleteCard_NonExistent(t *testing.T) { store := setupTestStoreWithCards(t) - defer store.Close() + defer func() { _ = store.Close() }() // Delete a card that doesn't exist - should not error err := store.DeleteCard("nonexistent") @@ -306,7 +306,7 @@ func TestDeleteCard_NonExistent(t *testing.T) { // where pointers in boardMap became stale when the boards slice grew. func TestSaveAndGetBoards_MultipleBoards(t *testing.T) { store := setupTestStoreWithCards(t) - defer store.Close() + defer func() { _ = store.Close() }() // Create multiple boards with varying numbers of cards // Use enough boards to trigger slice reallocation @@ -411,7 +411,7 @@ func TestSaveAndGetBoards_MultipleBoards(t *testing.T) { // to ensure slice reallocation is thoroughly tested func TestSaveAndGetBoards_ManyBoards(t *testing.T) { store := setupTestStoreWithCards(t) - defer store.Close() + defer func() { _ = store.Close() }() // Create 20 boards with 5 cards each = 100 cards total numBoards := 20 @@ -466,7 +466,7 @@ func TestSaveAndGetBoards_ManyBoards(t *testing.T) { func TestGetTasksByDateRange(t *testing.T) { store := setupTestStoreWithTasks(t) - defer store.Close() + defer func() { _ = store.Close() }() now := time.Now() tomorrow := now.Add(24 * time.Hour) @@ -498,7 +498,7 @@ func TestGetTasksByDateRange(t *testing.T) { func TestGetMealsByDateRange(t *testing.T) { store := setupTestStoreWithMeals(t) - defer store.Close() + defer func() { _ = store.Close() }() now := time.Now() tomorrow := now.Add(24 * time.Hour) @@ -530,7 +530,7 @@ func TestGetMealsByDateRange(t *testing.T) { func TestGetCardsByDateRange(t *testing.T) { store := setupTestStoreWithCards(t) - defer store.Close() + defer func() { _ = store.Close() }() now := time.Now() tomorrow := now.Add(24 * time.Hour) @@ -603,7 +603,7 @@ func setupTestStoreWithBugs(t *testing.T) *Store { func TestBugResolution(t *testing.T) { store := setupTestStoreWithBugs(t) - defer store.Close() + defer func() { _ = store.Close() }() // Save some bugs if err := store.SaveBug("Bug 1"); err != nil { @@ -681,7 +681,7 @@ func TestBugResolution(t *testing.T) { func TestResolveBug_NonExistent(t *testing.T) { store := setupTestStoreWithBugs(t) - defer store.Close() + defer func() { _ = store.Close() }() // Resolving a non-existent bug should not error (no rows affected is fine) err := store.ResolveBug(999) |
