Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/db/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (db *DB) ListLabels(project string) ([]model.Label, error) {
if err != nil {
return nil, fmt.Errorf("failed to list labels: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var labels []model.Label
for rows.Next() {
Expand Down Expand Up @@ -208,7 +208,7 @@ func (db *DB) GetItemLabels(itemID string) ([]model.Label, error) {
if err != nil {
return nil, fmt.Errorf("failed to get item labels: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var labels []model.Label
for rows.Next() {
Expand Down Expand Up @@ -257,7 +257,7 @@ func (db *DB) PopulateItemLabels(items []model.Item) error {
if err != nil {
return fmt.Errorf("failed to query item labels: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

// Build a map of item ID -> label names
labelMap := make(map[string][]string)
Expand Down
24 changes: 12 additions & 12 deletions internal/db/learnings.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (db *DB) GetLearning(id string) (*model.Learning, error) {
if err != nil {
return nil, fmt.Errorf("failed to get concepts: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

for rows.Next() {
var concept string
Expand Down Expand Up @@ -153,7 +153,7 @@ func (db *DB) ListConcepts(project string, sortByRecent bool) ([]model.Concept,
if err != nil {
return nil, fmt.Errorf("failed to list concepts: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var concepts []model.Concept
for rows.Next() {
Expand Down Expand Up @@ -327,7 +327,7 @@ func (db *DB) GetLearningsByConcepts(project string, conceptNames []string, incl
if err != nil {
return nil, fmt.Errorf("failed to query learnings: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var learnings []model.Learning
for rows.Next() {
Expand Down Expand Up @@ -359,12 +359,12 @@ func (db *DB) GetLearningsByConcepts(project string, conceptNames []string, incl
for conceptRows.Next() {
var concept string
if err := conceptRows.Scan(&concept); err != nil {
conceptRows.Close()
_ = conceptRows.Close()
return nil, fmt.Errorf("failed to scan concept: %w", err)
}
l.Concepts = append(l.Concepts, concept)
}
conceptRows.Close()
_ = conceptRows.Close()

learnings = append(learnings, l)
}
Expand Down Expand Up @@ -394,7 +394,7 @@ func (db *DB) SearchLearnings(project string, query string, includeStale bool) (
if err != nil {
return nil, fmt.Errorf("failed to search learnings: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var learnings []model.Learning
for rows.Next() {
Expand Down Expand Up @@ -426,12 +426,12 @@ func (db *DB) SearchLearnings(project string, query string, includeStale bool) (
for conceptRows.Next() {
var concept string
if err := conceptRows.Scan(&concept); err != nil {
conceptRows.Close()
_ = conceptRows.Close()
return nil, fmt.Errorf("failed to scan concept: %w", err)
}
l.Concepts = append(l.Concepts, concept)
}
conceptRows.Close()
_ = conceptRows.Close()

learnings = append(learnings, l)
}
Expand Down Expand Up @@ -462,7 +462,7 @@ func (db *DB) ListConceptsWithStats(project string) ([]ConceptStats, error) {
if err != nil {
return nil, fmt.Errorf("failed to list concept stats: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var stats []ConceptStats
now := time.Now()
Expand Down Expand Up @@ -516,7 +516,7 @@ func (db *DB) GetAllLearnings(project string, includeStale bool) ([]model.Learni
if err != nil {
return nil, fmt.Errorf("failed to query learnings: %w", err)
}
defer rows.Close()
defer func() { _ = rows.Close() }()

var learnings []model.Learning
for rows.Next() {
Expand Down Expand Up @@ -548,12 +548,12 @@ func (db *DB) GetAllLearnings(project string, includeStale bool) ([]model.Learni
for conceptRows.Next() {
var concept string
if err := conceptRows.Scan(&concept); err != nil {
conceptRows.Close()
_ = conceptRows.Close()
return nil, fmt.Errorf("failed to scan concept: %w", err)
}
l.Concepts = append(l.Concepts, concept)
}
conceptRows.Close()
_ = conceptRows.Close()

learnings = append(learnings, l)
}
Expand Down
3 changes: 1 addition & 2 deletions internal/db/learnings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,7 @@ func TestGetCurrentTaskID(t *testing.T) {
}
if taskID == nil {
t.Fatal("expected task ID, got nil")
}
if *taskID != task.ID {
} else if *taskID != task.ID {
t.Errorf("taskID = %q, want %q", *taskID, task.ID)
}
}
Expand Down
Loading