GODRIVER-407: allow readPreference to be implicit in connection string

tgerk · tgerk · commit 2381ee46c72e · 2018-05-05T16:47:55.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ debug
 *.ipr
 *.iws
 .idea
+*.sublime-project
+*.sublime-workspace
diff --git a/mongo/client.go b/mongo/client.go
@@ -190,6 +190,7 @@ func readPreferenceFromConnString(cs *connstring.ConnString) (*readpref.ReadPref
 	if cs.MaxStaleness != 0 {
 		options = append(options, readpref.WithMaxStaleness(cs.MaxStaleness))
 	}
+
 	if len(cs.ReadPreference) > 0 {
 		if rp == nil {
 			mode, _ := readpref.ModeFromString(cs.ReadPreference)
@@ -199,7 +200,8 @@ func readPreferenceFromConnString(cs *connstring.ConnString) (*readpref.ReadPref
 			}
 		}
 	}
-	return rp, nil
+
+	return readPref.Primary();
 }
 
 // Database returns a handle for a given database.

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ func readPreferenceFromConnString(cs connstring.ConnString) (readpref.ReadPref`
`190`	`190`	`if cs.MaxStaleness != 0 {`
`191`	`191`	`options = append(options, readpref.WithMaxStaleness(cs.MaxStaleness))`
`192`	`192`	`}`
	`193`	`+`
`193`	`194`	`if len(cs.ReadPreference) > 0 {`
`194`	`195`	`if rp == nil {`
`195`	`196`	`mode, _ := readpref.ModeFromString(cs.ReadPreference)`
`@@ -199,7 +200,8 @@ func readPreferenceFromConnString(cs connstring.ConnString) (readpref.ReadPref`
`199`	`200`	`}`
`200`	`201`	`}`
`201`	`202`	`}`
`202`		`- return rp, nil`
	`203`	`+`
	`204`	`+ return readPref.Primary();`
`203`	`205`	`}`
`204`	`206`
`205`	`207`	`// Database returns a handle for a given database.`