Merge branch 'release/v2.2.1'

CHANGELOG.md

@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v2.2.1 - 2016-09-18
+
+### Added
+
+ - Added `State` and `Error` to `ChangeResponse`
+
+### Fixed
+
+ - Fixed panic caused by cursor trying to read outstanding responses while closed
+ - Fixed panic when using mock session
+
 ## v2.2.0 - 2016-08-16
 
 ### Added

README.md

@@ -8,7 +8,7 @@
 
 ![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
 
-Current version: v2.2.0 (RethinkDB v2.3)
+Current version: v2.2.1 (RethinkDB v2.3)
 
 Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
 

cursor.go

@@ -21,8 +21,14 @@ func newCursor(conn *Connection, cursorType string, token int64, term *Term, opt
 		cursorType = "Cursor"
 	}
 
+	connOpts := &ConnectOpts{}
+	if conn != nil {
+		connOpts = conn.opts
+	}
+
 	cursor := &Cursor{
 		conn:       conn,
+		connOpts:   connOpts,
 		token:      token,
 		cursorType: cursorType,
 		term:       term,
@@ -53,6 +59,7 @@ type Cursor struct {
 	releaseConn func() error
 
 	conn       *Connection
+	connOpts   *ConnectOpts
 	token      int64
 	cursorType string
 	term       *Term
@@ -602,7 +609,7 @@ func (c *Cursor) seekCursor(bufferResponse bool) error {
 	for {
 		c.applyPendingSkips(bufferResponse) // if we are buffering the responses, skip can drain from the buffer
 
-		if bufferResponse && len(c.buffer) == 0 && len(c.responses) > 0 {
+		if bufferResponse && len(c.buffer) == 0 && len(c.responses) > 0 && !c.closed {
 			if err := c.bufferNextResponse(); err != nil {
 				return err
 			}
@@ -665,7 +672,7 @@ func (c *Cursor) bufferNextResponse() error {
 
 	var value interface{}
 	decoder := json.NewDecoder(bytes.NewBuffer(response))
-	if c.conn.opts.UseJSONNumber {
+	if c.connOpts.UseJSONNumber {
 		decoder.UseNumber()
 	}
 	err := decoder.Decode(&value)

doc.go

@@ -1,6 +1,6 @@
 // Package gorethink implements a Go driver for RethinkDB
 //
-// Current version: v2.2.0 (RethinkDB v2.3)
+// Current version: v2.2.1 (RethinkDB v2.3)
 // For more in depth information on how to use RethinkDB check out the API docs
 // at http://rethinkdb.com/api
 package gorethink

query.go

@@ -288,8 +288,10 @@ type WriteResponse struct {
 // ChangeResponse is a helper type used when dealing with changefeeds. The type
 // contains both the value before the query and the new value.
 type ChangeResponse struct {
-	NewValue interface{} `gorethink:"new_val"`
-	OldValue interface{} `gorethink:"old_val"`
+	NewValue interface{} `gorethink:"new_val,omitempty"`
+	OldValue interface{} `gorethink:"old_val,omitempty"`
+	State    string      `gorethink:"state,omitempty"`
+	Error    string      `gorethink:"error,omitempty"`
 }
 
 // RunOpts contains the optional arguments for the Run function.