Skip to content

Close branch rows and handle iteration errors in DeleteProject #11

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

Open
kojah wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Close branch rows and handle iteration errors in DeleteProject #11

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
3 changes: 1 addition & 2 deletions internal/envcfg/envcfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ func initEnv() {
loadErr = fmt.Errorf("load env: file '%v': %w", filename, err)
break
}
defer f.Close()

m, err := godotenv.Parse(f)
f.Close()
if err != nil {
loadErr = fmt.Errorf("read env: file '%v': %w", filename, err)
break
Expand Down
5 changes: 4 additions & 1 deletion services/projects/store/sqlstore/store_sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,12 +411,15 @@ func (s *sqlProjectStore) DeleteProject(ctx context.Context, organizationID stri
if err != nil {
return err
}
defer branches.Close()

// there is at least one branch in the project
if branches.Next() {
return store.ErrProjectNotEmpty{ID: projectID}
}
defer branches.Close()
if err := branches.Err(); err != nil {
return err
}

// clean up any remaining backup entries for this project
_, err = tx.ExecContext(ctx, "DELETE FROM backups WHERE project_id = $1", projectID)
Expand Down