Merge branch 'pr/52'

Change-Id: I709caabd30d4431e82780cd10ab7376cf9aab350

Author: skriptble

.gitignore

@@ -5,3 +5,5 @@ debug
 *.ipr
 *.iws
 .idea
+*.sublime-project
+*.sublime-workspace

bson/encode.go

@@ -525,7 +525,7 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 		if omitempty && e.isZero(field) {
 			continue
 		}
-		
+
 		if inline {
 			switch sf.Type.Kind() {
 			case reflect.Map:

mongo/client.go

@@ -118,14 +118,20 @@ func newClient(cs connstring.ConnString, opts *ClientOptions) (*Client, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	client.topology = topo
+
 	client.readConcern = readConcernFromConnString(&client.connString)
 	client.writeConcern = writeConcernFromConnString(&client.connString)
-	client.readPreference, err = readPreferenceFromConnString(&client.connString)
+
+	rp, err := readPreferenceFromConnString(&client.connString)
 	if err != nil {
 		return nil, err
 	}
+	if rp != nil {
+		client.readPreference = rp
+	} else {
+		client.readPreference = readpref.Primary()
+	}
 
 	return client, nil
 }
@@ -190,6 +196,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,6 +206,7 @@ func readPreferenceFromConnString(cs *connstring.ConnString) (*readpref.ReadPref
 			}
 		}
 	}
+
 	return rp, nil
 }
 

mongo/client_internal_test.go

@@ -331,5 +331,17 @@ func TestClient_ReadPreference(t *testing.T) {
 	d, flag := c.readPreference.MaxStaleness()
 	require.True(t, flag)
 	require.Equal(t, time.Duration(5)*time.Second, d)
+}
+
+func TestClient_ReadPreferenceAbsent(t *testing.T) {
+	t.Parallel()
 
+	cs := testutil.ConnString(t)
+	c, err := NewClient(cs.String())
+	require.NoError(t, err)
+	require.NotNil(t, c)
+	require.Equal(t, readpref.PrimaryMode, c.readPreference.Mode())
+	require.Empty(t, c.readPreference.TagSets())
+	_, flag := c.readPreference.MaxStaleness()
+	require.False(t, flag)
 }