Merge pull request #455 from or-else/patch-2

Added json tags to ConnectOpts to make it serializable

Author: CMogilko

encoding/decoder_test.go

@@ -433,7 +433,7 @@ func TestDecodeUnmarshalerPointer(t *testing.T) {
 		t.Errorf("got error %v, expected nil", err)
 	}
 	if !jsonEqual(out, want) {
-		t.Errorf("got %q, want %q", out, want)
+		t.Errorf("got %+v, want %+v", out, want)
 	}
 }
 
@@ -587,7 +587,7 @@ func TestDecodeCustomTypeEncodingPointer(t *testing.T) {
 		t.Errorf("got error %v, expected nil", err)
 	}
 	if !jsonEqual(out, want) {
-		t.Errorf("got %q, want %q", out, want)
+		t.Errorf("got %+v, want %+v", out, want)
 	}
 }
 

session.go

@@ -24,85 +24,85 @@ type Session struct {
 type ConnectOpts struct {
 	// Address holds the address of the server initially used when creating the
 	// session. Only used if Addresses is empty
-	Address string `rethinkdb:"address,omitempty"`
+	Address string `rethinkdb:"address,omitempty" json:"address,omitempty"`
 	// Addresses holds the addresses of the servers initially used when creating
 	// the session.
-	Addresses []string `rethinkdb:"addresses,omitempty"`
+	Addresses []string `rethinkdb:"addresses,omitempty" json:"addresses,omitempty"`
 	// Database is the default database name used when executing queries, this
 	// value is only used if the query does not contain any DB term
-	Database string `rethinkdb:"database,omitempty"`
+	Database string `rethinkdb:"database,omitempty" json:"database,omitempty"`
 	// Username holds the username used for authentication, if blank (and the v1
 	// handshake protocol is being used) then the admin user is used
-	Username string `rethinkdb:"username,omitempty"`
+	Username string `rethinkdb:"username,omitempty" json:"username,omitempty"`
 	// Password holds the password used for authentication (only used when using
 	// the v1 handshake protocol)
-	Password string `rethinkdb:"password,omitempty"`
+	Password string `rethinkdb:"password,omitempty" json:"password,omitempty"`
 	// AuthKey is used for authentication when using the v0.4 handshake protocol
 	// This field is no deprecated
-	AuthKey string `rethinkdb:"authkey,omitempty"`
+	AuthKey string `rethinkdb:"authkey,omitempty" json:"authkey,omitempty"`
 	// Timeout is the time the driver waits when creating new connections, to
 	// configure the timeout used when executing queries use WriteTimeout and
 	// ReadTimeout
-	Timeout time.Duration `rethinkdb:"timeout,omitempty"`
+	Timeout time.Duration `rethinkdb:"timeout,omitempty" json:"timeout,omitempty"`
 	// WriteTimeout is the amount of time the driver will wait when sending the
 	// query to the server
-	WriteTimeout time.Duration `rethinkdb:"write_timeout,omitempty"`
+	WriteTimeout time.Duration `rethinkdb:"write_timeout,omitempty" json:"write_timeout,omitempty"`
 	// ReadTimeout is the amount of time the driver will wait for a response from
 	// the server when executing queries.
-	ReadTimeout time.Duration `rethinkdb:"read_timeout,omitempty"`
+	ReadTimeout time.Duration `rethinkdb:"read_timeout,omitempty" json:"read_timeout,omitempty"`
 	// KeepAlivePeriod is the keep alive period used by the connection, by default
 	// this is 30s. It is not possible to disable keep alive messages
-	KeepAlivePeriod time.Duration `rethinkdb:"keep_alive_timeout,omitempty"`
+	KeepAlivePeriod time.Duration `rethinkdb:"keep_alive_timeout,omitempty" json:"keep_alive_timeout,omitempty"`
 	// TLSConfig holds the TLS configuration and can be used when connecting
 	// to a RethinkDB server protected by SSL
-	TLSConfig *tls.Config `rethinkdb:"tlsconfig,omitempty"`
+	TLSConfig *tls.Config `rethinkdb:"tlsconfig,omitempty" json:"tlsconfig,omitempty"`
 	// HandshakeVersion is used to specify which handshake version should be
 	// used, this currently defaults to v1 which is used by RethinkDB 2.3 and
 	// later. If you are using an older version then you can set the handshake
 	// version to 0.4
-	HandshakeVersion HandshakeVersion `rethinkdb:"handshake_version,omitempty"`
+	HandshakeVersion HandshakeVersion `rethinkdb:"handshake_version,omitempty" json:"handshake_version,omitempty"`
 	// UseJSONNumber indicates whether the cursors running in this session should
 	// use json.Number instead of float64 while unmarshaling documents with
 	// interface{}. The default is `false`.
-	UseJSONNumber bool
+	UseJSONNumber bool `json:"use_json_number,omitempty"`
 	// NumRetries is the number of times a query is retried if a connection
 	// error is detected, queries are not retried if RethinkDB returns a
 	// runtime error.
-	NumRetries int
+	NumRetries int `json:"num_retries,omitempty"`
 
 	// InitialCap is used by the internal connection pool and is used to
 	// configure how many connections are created for each host when the
 	// session is created. If zero then no connections are created until
 	// the first query is executed.
-	InitialCap int `rethinkdb:"initial_cap,omitempty"`
+	InitialCap int `rethinkdb:"initial_cap,omitempty" json:"initial_cap,omitempty"`
 	// MaxOpen is used by the internal connection pool and is used to configure
 	// the maximum number of connections held in the pool. If all available
 	// connections are being used then the driver will open new connections as
 	// needed however they will not be returned to the pool. By default the
 	// maximum number of connections is 2
-	MaxOpen int `rethinkdb:"max_open,omitempty"`
+	MaxOpen int `rethinkdb:"max_open,omitempty" json:"max_open,omitempty"`
 
 	// Below options are for cluster discovery, please note there is a high
 	// probability of these changing as the API is still being worked on.
 
 	// DiscoverHosts is used to enable host discovery, when true the driver
 	// will attempt to discover any new nodes added to the cluster and then
 	// start sending queries to these new nodes.
-	DiscoverHosts bool `rethinkdb:"discover_hosts,omitempty"`
+	DiscoverHosts bool `rethinkdb:"discover_hosts,omitempty" json:"discover_hosts,omitempty"`
 	// HostDecayDuration is used by the go-hostpool package to calculate a weighted
 	// score when selecting a host. By default a value of 5 minutes is used.
-	HostDecayDuration time.Duration
+	HostDecayDuration time.Duration `json:"host_decay_duration,omitempty"`
 
 	// UseOpentracing is used to enable creating opentracing-go spans for queries.
 	// Each span is created as child of span from the context in `RunOpts`.
 	// This span lasts from point the query created to the point when cursor closed.
-	UseOpentracing bool
+	UseOpentracing bool `json:"use_opentracing,omitempty"`
 
 	// Deprecated: This function is no longer used due to changes in the
 	// way hosts are selected.
-	NodeRefreshInterval time.Duration `rethinkdb:"node_refresh_interval,omitempty"`
+	NodeRefreshInterval time.Duration `rethinkdb:"node_refresh_interval,omitempty" json:"node_refresh_interval,omitempty"`
 	// Deprecated: Use InitialCap instead
-	MaxIdle int `rethinkdb:"max_idle,omitempty"`
+	MaxIdle int `rethinkdb:"max_idle,omitempty" json:"max_idle,omitempty"`
 }
 
 func (o ConnectOpts) toMap() map[string]interface{} {