Skip to content

fix(Migrator): don't let rows.Close() overwrite ColumnTypes errors - #243

Open
h2zi wants to merge 1 commit into
go-gorm:masterfrom
h2zi:fix-columntypes-error
Open

fix(Migrator): don't let rows.Close() overwrite ColumnTypes errors#243
h2zi wants to merge 1 commit into
go-gorm:masterfrom
h2zi:fix-columntypes-error

Conversation

@h2zi

@h2zi h2zi commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

ColumnTypes defers err = rows.Close() onto its named return value, unconditionally replacing whatever error occurred after the rows were opened — an error from rows.ColumnTypes() or the merge loop is swallowed by the (almost always nil) Close result, and the caller sees success with incomplete data. Keep the first error, still surfacing a Close failure 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.

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.
Copilot AI review requested due to automatic review settings July 31, 2026 09:33

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

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 ColumnTypes execution 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants