Additional PR Fixes #647

Author: Steve Ramage

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:

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
 	}