Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Resolves #647 - Fixes typos in Mongo advisory locking parameters #648

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

Merged
merged 8 commits into from
Nov 5, 2021
Merged

Resolves #647 - Fixes typos in Mongo advisory locking parameters #648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18dd02b
Resolves #647 - Fixes typos in Mongo advisory locking parameters
Oct 27, 2021
b63f099
PR Feedback for #647 - Error out when both params set
Nov 4, 2021
fa52996
Fixes lint issues with #647
Nov 5, 2021
2fe1563
Additional PR Fixes #647
Nov 5, 2021
4ba4318
Lint fixes again #647
Nov 5, 2021
868d692
One more tweak to CONTRIBUTING.md
Nov 5, 2021
dd50406
One more tweak to CONTRIBUTING.md, again
Nov 5, 2021
de8708a
Merge branch 'master' into issue-647
SJrX Nov 5, 2021
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
Prev Previous commit
Next Next commit
Additional PR Fixes #647
  • Loading branch information
Steve Ramage committed Nov 5, 2021
commit 2fe1563b8c2cab07e80d0e1739f6d5db809a6ecd
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
1. Write awesome code ...
1. `make test` to run all tests against all database versions
1. Push code and open Pull Request
:wq
Some more helpful commands:

* You can specify which database/ source tests to run:
Expand Down
6 changes: 3 additions & 3 deletions database/mongodb/mongodb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const contextWaitTimeout = 5 * time.Second // how long to wait for

var (
ErrNoDatabaseName = fmt.Errorf("no database name")
ErrNilConfig = fmt.Errorf("no config")
ErrTypoAndNotNonTypoUsed = fmt.Errorf("both x-advisory-lock-timeout-interval and x-advisory-lock-timout-interval were specified")
ErrNilConfig = fmt.Errorf("no config")
ErrLockTimeoutConfigConflict = fmt.Errorf("both x-advisory-lock-timeout-interval and x-advisory-lock-timout-interval were specified")
)

type Mongo struct {
Expand Down Expand Up @@ -147,7 +147,7 @@ func (m *Mongo) Open(dsn string) (database.Driver, error) {
lockTimeout := lockTimeoutIntervalValue

if lockTimeoutIntervalValue != "" && lockTimeoutIntervalValueFromTypo != "" {
return nil, ErrTypoAndNotNonTypoUsed
return nil, ErrLockTimeoutConfigConflict
} else if lockTimeoutIntervalValueFromTypo != "" {
lockTimeout = lockTimeoutIntervalValueFromTypo
}
Expand Down