From 2fe1563b8c2cab07e80d0e1739f6d5db809a6ecd Mon Sep 17 00:00:00 2001 From: Steve Ramage Date: Thu, 4 Nov 2021 21:43:09 -0700 Subject: [PATCH] Additional PR Fixes #647 --- CONTRIBUTING.md | 1 - database/mongodb/mongodb.go | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e94c65ddd..42213413f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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: diff --git a/database/mongodb/mongodb.go b/database/mongodb/mongodb.go index b6c3a5caa..599518cd5 100644 --- a/database/mongodb/mongodb.go +++ b/database/mongodb/mongodb.go @@ -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 { @@ -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 }