Add mongo/dbopt

GODRIVER-272

Change-Id: Ie3af88a02a1bf64ab0a07a5a74438215382cdf1e

Author: Divjot Arora

core/command/list_collections.go

@@ -12,6 +12,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/option"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
 	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
@@ -23,8 +24,9 @@ type ListCollections struct {
 	Filter *bson.Document
 	Opts   []option.ListCollectionsOptioner
 
-	result Cursor
-	err    error
+	result   Cursor
+	ReadPref *readpref.ReadPref
+	err      error
 }
 
 // Encode will encode this command into a wire message for the given server description.
@@ -45,7 +47,7 @@ func (lc *ListCollections) Encode(desc description.SelectedServer) (wiremessage.
 		}
 	}
 
-	return (&Command{DB: lc.DB, Command: cmd, isWrite: true}).Encode(desc)
+	return (&Command{DB: lc.DB, Command: cmd, isWrite: true, ReadPref: lc.ReadPref}).Encode(desc)
 }
 
 // Decode will decode the wire message using the provided server description. Errors during decoding

mongo/client.go

@@ -21,6 +21,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
 	"github.com/mongodb/mongo-go-driver/mongo/clientopt"
+	"github.com/mongodb/mongo-go-driver/mongo/dbopt"
 )
 
 const defaultLocalThreshold = 15 * time.Millisecond
@@ -212,8 +213,8 @@ func readPreferenceFromConnString(cs *connstring.ConnString) (*readpref.ReadPref
 }
 
 // Database returns a handle for a given database.
-func (c *Client) Database(name string) *Database {
-	return newDatabase(c, name)
+func (c *Client) Database(name string, opts ...dbopt.Option) *Database {
+	return newDatabase(c, name, opts...)
 }
 
 // ConnectionString returns the connection string of the cluster the client is connected to.

mongo/database.go

@@ -18,6 +18,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/core/readpref"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
 	"github.com/mongodb/mongo-go-driver/mongo/collectionopt"
+	"github.com/mongodb/mongo-go-driver/mongo/dbopt"
 )
 
 // Database performs operations on a given database.
@@ -31,13 +32,33 @@ type Database struct {
 	writeSelector  description.ServerSelector
 }
 
-func newDatabase(client *Client, name string) *Database {
+func newDatabase(client *Client, name string, opts ...dbopt.Option) *Database {
+	dbOpt, err := dbopt.BundleDatabase(opts...).Unbundle()
+	if err != nil {
+		return nil
+	}
+
+	rc := client.readConcern
+	if dbOpt.ReadConcern != nil {
+		rc = dbOpt.ReadConcern
+	}
+
+	rp := client.readPreference
+	if dbOpt.ReadPreference != nil {
+		rp = dbOpt.ReadPreference
+	}
+
+	wc := client.writeConcern
+	if dbOpt.WriteConcern != nil {
+		wc = dbOpt.WriteConcern
+	}
+
 	db := &Database{
 		client:         client,
 		name:           name,
-		readPreference: client.readPreference,
-		readConcern:    client.readConcern,
-		writeConcern:   client.writeConcern,
+		readPreference: rp,
+		readConcern:    rc,
+		writeConcern:   wc,
 	}
 
 	db.readSelector = description.CompositeSelector([]description.ServerSelector{
@@ -73,7 +94,11 @@ func (db *Database) RunCommand(ctx context.Context, runCommand interface{}) (bso
 		ctx = context.Background()
 	}
 
-	cmd := command.Command{DB: db.Name(), Command: runCommand}
+	cmd := command.Command{
+		DB:       db.Name(),
+		Command:  runCommand,
+		ReadPref: db.readPreference,
+	}
 	return dispatch.Command(ctx, cmd, db.client.topology, db.writeSelector)
 }
 
@@ -99,9 +124,10 @@ func (db *Database) ListCollections(ctx context.Context, filter *bson.Document,
 		ctx = context.Background()
 	}
 	cmd := command.ListCollections{
-		DB:     db.name,
-		Filter: filter,
-		Opts:   options,
+		DB:       db.name,
+		Filter:   filter,
+		Opts:     options,
+		ReadPref: db.readPreference,
 	}
 	cursor, err := dispatch.ListCollections(ctx, cmd, db.client.topology, db.readSelector)
 	if err != nil && !command.IsNotFound(err) {

mongo/database_internal_test.go

@@ -15,18 +15,22 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/core/readconcern"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/writeconcern"
 	"github.com/mongodb/mongo-go-driver/internal/testutil"
+	"github.com/mongodb/mongo-go-driver/mongo/dbopt"
 	"github.com/stretchr/testify/require"
 )
 
-func createTestDatabase(t *testing.T, name *string) *Database {
+func createTestDatabase(t *testing.T, name *string, opts ...dbopt.Option) *Database {
 	if name == nil {
 		db := testutil.DBName(t)
 		name = &db
 	}
 
 	client := createTestClient(t)
-	return client.Database(*name)
+	return client.Database(*name, opts...)
 }
 
 func TestDatabase_initialize(t *testing.T) {
@@ -39,6 +43,70 @@ func TestDatabase_initialize(t *testing.T) {
 	require.NotNil(t, db.client)
 }
 
+func compareDbs(t *testing.T, expected *Database, got *Database) {
+	switch {
+	case expected.readPreference != got.readPreference:
+		t.Errorf("expected read preference %#v. got %#v", expected.readPreference, got.readPreference)
+	case expected.readConcern != got.readConcern:
+		t.Errorf("expected read concern %#v. got %#v", expected.readConcern, got.readConcern)
+	case expected.writeConcern != got.writeConcern:
+		t.Errorf("expected write concern %#v. got %#v", expected.writeConcern, got.writeConcern)
+	}
+}
+
+func TestDatabase_Options(t *testing.T) {
+	name := "testDb_options"
+	rpPrimary := readpref.Primary()
+	rpSecondary := readpref.Secondary()
+	wc1 := writeconcern.New(writeconcern.W(5))
+	wc2 := writeconcern.New(writeconcern.W(10))
+	rcLocal := readconcern.Local()
+	rcMajority := readconcern.Majority()
+
+	opts := []dbopt.Option{dbopt.ReadPreference(rpPrimary), dbopt.ReadConcern(rcLocal), dbopt.WriteConcern(wc1),
+		dbopt.ReadPreference(rpSecondary), dbopt.ReadConcern(rcMajority), dbopt.WriteConcern(wc2)}
+
+	expectedDb := &Database{
+		readConcern:    rcMajority,
+		readPreference: rpSecondary,
+		writeConcern:   wc2,
+	}
+
+	t.Run("IndividualOptions", func(t *testing.T) {
+		// if options specified multiple times, last instance should take precedence
+		db := createTestDatabase(t, &name, opts...)
+		compareDbs(t, expectedDb, db)
+	})
+
+	t.Run("Bundle", func(t *testing.T) {
+		db := createTestDatabase(t, &name, dbopt.BundleDatabase(opts...))
+		compareDbs(t, expectedDb, db)
+	})
+}
+
+func TestDatabase_InheritOptions(t *testing.T) {
+	name := "testDb_options_inherit"
+	client := createTestClient(t)
+
+	rpPrimary := readpref.Primary()
+	rcLocal := readconcern.Local()
+	client.readPreference = rpPrimary
+	client.readConcern = rcLocal
+
+	wc1 := writeconcern.New(writeconcern.W(10))
+	db := client.Database(name, dbopt.WriteConcern(wc1))
+
+	// db should inherit read preference and read concern from client
+	switch {
+	case db.readPreference != rpPrimary:
+		t.Errorf("expected read preference primary. got %#v", db.readPreference)
+	case db.readConcern != rcLocal:
+		t.Errorf("expected read concern local. got %#v", db.readConcern)
+	case db.writeConcern != wc1:
+		t.Errorf("expected write concern %#v. got %#v", wc1, db.writeConcern)
+	}
+}
+
 func TestDatabase_RunCommand(t *testing.T) {
 	t.Parallel()
 
@@ -190,20 +258,24 @@ func listCollectionsTest(db *Database, cappedOnly bool) error {
 }
 
 func TestDatabase_ListCollections(t *testing.T) {
-	// TODO(GODRIVER-272): Add tests for the replica_set topology using the secondary read preference
 	t.Parallel()
+	rpPrimary := readpref.Primary()
+	rpSecondary := readpref.Secondary()
 
 	var listCollectionsTable = []struct {
 		name             string
 		expectedTopology string
 		cappedOnly       bool
+		rp               *readpref.ReadPref
 	}{
-		{"standalone_nofilter", "server", false},
-		{"standalone_filter", "server", true},
-		{"replicaset_nofilter", "replica_set", false},
-		{"replicaset_filter", "replica_set", true},
-		{"sharded_nofilter", "sharded_cluster", false},
-		{"sharded_filter", "sharded_cluster", true},
+		{"standalone_nofilter", "server", false, rpPrimary},
+		{"standalone_filter", "server", true, rpPrimary},
+		{"replicaset_nofilter", "replica_set", false, rpPrimary},
+		{"replicaset_filter", "replica_set", true, rpPrimary},
+		{"replicaset_secondary_nofilter", "replica_set", false, rpSecondary},
+		{"replicaset_secondary_filter", "replica_set", true, rpSecondary},
+		{"sharded_nofilter", "sharded_cluster", false, rpPrimary},
+		{"sharded_filter", "sharded_cluster", true, rpPrimary},
 	}
 
 	for _, tt := range listCollectionsTable {
@@ -212,7 +284,7 @@ func TestDatabase_ListCollections(t *testing.T) {
 				t.Skip()
 			}
 			dbName := "db_list_collections"
-			db := createTestDatabase(t, &dbName)
+			db := createTestDatabase(t, &dbName, dbopt.ReadPreference(tt.rp))
 
 			defer func() {
 				err := db.Drop(context.Background())