fix(Migrator): don't let rows.Close() overwrite ColumnTypes errors - #243
Open
h2zi wants to merge 1 commit into
Open
fix(Migrator): don't let rows.Close() overwrite ColumnTypes errors#243h2zi wants to merge 1 commit into
h2zi wants to merge 1 commit into
Conversation
The deferred `err = rows.Close()` unconditionally replaced the named return value, so any error from rows.ColumnTypes() or the merge loop was swallowed by the (almost always nil) Close result. Keep the first error instead.
There was a problem hiding this comment.
Pull request overview
Fixes Migrator.ColumnTypes error handling so that a deferred rows.Close() does not overwrite an earlier error from rows.ColumnTypes() or the column-type merge loop, while still returning a Close error when no prior error occurred.
Changes:
- Update deferred
rows.Close()handling to only set the return error when the current error is nil. - Preserve the first error encountered during
ColumnTypesexecution instead of potentially masking it with a (usually nil) close result.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This was referenced Jul 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ColumnTypesdeferserr = rows.Close()onto its named return value, unconditionally replacing whatever error occurred after the rows were opened — an error fromrows.ColumnTypes()or the merge loop is swallowed by the (almost always nil)Closeresult, and the caller sees success with incomplete data. Keep the first error, still surfacing aClosefailure when nothing else went wrong.🤖 Generated with Claude Code
Merge order (this batch: #241 → #242 → #243 → #244 → #245 → #246, plus #234 from the previous batch): all seven are functionally independent and merge cleanly in any order. Several append tests to the same test files, so whichever merges later may show a trivial append-only conflict in
migrator_test.go/ddlmod_test.go— I'll rebase the remaining ones promptly after each merge, as before.