Skip to content

fix(postgres): close per-schema typeRows inside the iteration #45

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
robert-chiniquy wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −2
Open

fix(postgres): close per-schema typeRows inside the iteration #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c61bdfe
fix(postgres): close per-schema typeRows inside the iteration
robert-chiniquy May 20, 2026
0dbf603
fix: check typeRows.Err() after the type-iteration loop
robert-chiniquy May 20, 2026
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
7 changes: 5 additions & 2 deletions pkg/postgres/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ func (c *Client) RevokeAllGrantsFromRole(ctx context.Context, roleName string) e
l.Warn("error querying types", zap.String("schema", schema), zap.Error(err))
revokeError = errors.Join(revokeError, err)
} else {
defer typeRows.Close()

for typeRows.Next() {
var typeName string
if err := typeRows.Scan(&typeName); err != nil {
Expand All @@ -290,6 +288,11 @@ func (c *Client) RevokeAllGrantsFromRole(ctx context.Context, roleName string) e
revokeError = errors.Join(revokeError, err)
}
}
if err := typeRows.Err(); err != nil {
l.Warn("error iterating types", zap.String("schema", schema), zap.Error(err))
revokeError = errors.Join(revokeError, err)
}
typeRows.Close()
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Suggestion: Pre-existing: typeRows.Err() is not checked after the for typeRows.Next() loop. If the iterator stops due to a network or driver error (rather than exhausting rows), the error is silently lost. Consider adding a typeRows.Err() check before Close().

Suggested change
typeRows.Close()
typeRows.Close()
if err := typeRows.Err(); err != nil {
l.Warn("error iterating types", zap.String("schema", schema), zap.Error(err))
revokeError = errors.Join(revokeError, err)
}

}

revokeSchemaQuery := fmt.Sprintf("REVOKE ALL ON SCHEMA %s FROM %s", sanitizedSchema, sanitizedRoleName)
Expand Down
Loading