fix: ExpectBegin TxOptions check uses && instead of ||#351
Open
c-tonneslan wants to merge 1 commit into
Open
Conversation
…OG#342) The Begin path required both Isolation AND ReadOnly to differ before the "options do not match" error fired, so any single-field mismatch silently passed. The existing TestContextBeginWithTxOptions even depended on that buggy behavior (Isolation matched, ReadOnly didn't, expectation still considered fulfilled). Switched the conjunction to a disjunction and fixed the existing test to use matching options. Added two new mismatch tests (one for Isolation-only differs, one for ReadOnly-only differs) that fail on master and pass with the fix. Signed-off-by: Charlie Tonneslan <cst0520@gmail.com>
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
1 participant
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.
Closes #342.
The Begin path in sqlmock.go:256 requires both `Isolation` AND `ReadOnly` to differ before the "options do not match" error fires, so a single-field mismatch silently passes:
```go
if expected.txOpts != nil &&
expected.txOpts.Isolation != opts.Isolation &&
expected.txOpts.ReadOnly != opts.ReadOnly {
```
The existing `TestContextBeginWithTxOptions` actually depended on that bug (Isolation matched, ReadOnly didn't, expectation was still considered fulfilled). Switched the conjunction to a disjunction so either-field mismatch is caught.
```
mock.ExpectBegin().WithTxOptions(sql.TxOptions{
Isolation: sql.LevelReadCommitted,
ReadOnly: true,
})
db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted, ReadOnly: false})
// before this PR: succeeds (wrong)
// after this PR: errors with "expected transaction options do not match"
```
Fixed the existing test to pass matching options and added two new mismatch tests (one for ReadOnly-only differs, one for Isolation-only differs). All pass on this branch, the new ones fail on master.