/{cmd,internal}: pr feedback

This commit is contained in:
coffeegoddd☕️✨ 2026-03-20 13:58:17 -07:00
commit e7a77a2fa3
3 changed files with 34 additions and 5 deletions

View file

@ -204,10 +204,10 @@ func TestEmbeddedDiff(t *testing.T) {
e := entries[0]
// Verify expected JSON keys
if _, ok := e["IssueID"]; !ok {
t.Error("expected 'issue_id' key in JSON entry")
t.Error("expected 'IssueID' key in JSON entry")
}
if _, ok := e["DiffType"]; !ok {
t.Error("expected 'diff_type' key in JSON entry")
t.Error("expected 'DiffType' key in JSON entry")
}
})

View file

@ -16,7 +16,10 @@ func (s *DoltStore) History(ctx context.Context, issueID string) ([]*storage.His
err := s.withReadTx(ctx, func(tx *sql.Tx) error {
var err error
result, err = issueops.HistoryInTx(ctx, tx, issueID)
return err
if err != nil {
return wrapQueryError("get issue history", err)
}
return nil
})
return result, err
}

View file

@ -12,6 +12,7 @@ import (
// GetStaleIssuesInTx returns issues that haven't been updated within the
// given number of days. Only non-ephemeral issues are considered. When
// filter.Status is empty, open and in_progress issues are returned.
// Results are ordered by updated_at ascending (stalest first).
//
// nolint:gosec // G201: statusClause contains only literal SQL or a single ? placeholder
func GetStaleIssuesInTx(ctx context.Context, tx *sql.Tx, filter types.StaleFilter) ([]*types.Issue, error) {
@ -42,24 +43,49 @@ func GetStaleIssuesInTx(ctx context.Context, tx *sql.Tx, filter types.StaleFilte
if err != nil {
return nil, fmt.Errorf("failed to get stale issues: %w", err)
}
defer rows.Close()
// Collect IDs first, then batch-fetch full issues.
// Close rows explicitly before the nested fetch — MySQL/Dolt drivers
// can't handle multiple active result sets on one connection.
var ids []string
for rows.Next() {
var id string
if err := rows.Scan(&id); err != nil {
rows.Close()
return nil, fmt.Errorf("failed to scan stale issue id: %w", err)
}
ids = append(ids, id)
}
if err := rows.Err(); err != nil {
rows.Close()
return nil, fmt.Errorf("stale issues rows: %w", err)
}
rows.Close()
if len(ids) == 0 {
return nil, nil
}
return GetIssuesByIDsInTx(ctx, tx, ids)
// GetIssuesByIDsInTx returns issues in arbitrary order (WHERE IN),
// so re-order to preserve the updated_at ASC ordering from the query.
issues, err := GetIssuesByIDsInTx(ctx, tx, ids)
if err != nil {
return nil, err
}
issueByID := make(map[string]*types.Issue, len(issues))
for _, iss := range issues {
if iss != nil {
issueByID[iss.ID] = iss
}
}
ordered := make([]*types.Issue, 0, len(ids))
for _, id := range ids {
if iss, ok := issueByID[id]; ok {
ordered = append(ordered, iss)
}
}
return ordered, nil
}