Skip to content

fix rollback handling #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imran31415 merged 1 commit into from
Feb 15, 2026
Merged

fix rollback handling #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions internal/apikeys/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ func (s *Service) UpdateAPIKey(ctx context.Context, userID, keyID string, req *t
return nil, fmt.Errorf("failed to start transaction: %w", err)
}
defer func() {
if err := tx.Rollback(); err != nil {
if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
log.Printf("Failed to rollback transaction: %v", err)
}
}()
Expand Down Expand Up @@ -709,7 +709,7 @@ func (s *Service) DeleteAPIKey(ctx context.Context, userID, keyID string) error
return fmt.Errorf("failed to start transaction: %w", err)
}
defer func() {
if err := tx.Rollback(); err != nil {
if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
log.Printf("Failed to rollback transaction: %v", err)
}
}()
Expand Down
4 changes: 2 additions & 2 deletions internal/teams/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (h *Handler) createTeamWithAgents(w http.ResponseWriter, r *http.Request) {
return
}
defer func() {
if err := tx.Rollback(); err != nil {
if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
log.Printf("Failed to rollback transaction: %v", err)
}
}()
Expand Down Expand Up @@ -777,7 +777,7 @@ func (h *Handler) updateTeamContextForAllAgents(teamID, userID string, sharedCon
return fmt.Errorf("failed to start transaction: %w", err)
}
defer func() {
if err := tx.Rollback(); err != nil {
if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
log.Printf("Failed to rollback transaction: %v", err)
}
}()
Expand Down
4 changes: 2 additions & 2 deletions internal/templates/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (ts *TemplateService) CreateTemplate(template *types.ExecutionTemplate, par
return nil, fmt.Errorf("failed to begin transaction: %w", err)
}
defer func() {
if err := tx.Rollback(); err != nil {
if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
log.Printf("Failed to rollback transaction: %v", err)
}
}()
Expand Down Expand Up @@ -420,7 +420,7 @@ func (ts *TemplateService) UpdateTemplate(_ string, template *types.ExecutionTem
return nil, nil, fmt.Errorf("failed to begin transaction: %w", err)
}
defer func() {
if err := tx.Rollback(); err != nil {
if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
log.Printf("Failed to rollback transaction: %v", err)
}
}()
Expand Down
Loading