Merge branch 'hotfix/v0.3.2'

Author: dancannon

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.3.2 - 17 Aug 2014
+
+- Fixed issue causing connections not to be closed correctly (#109)
+- Fixed issue causing terms in optional arguments to be encoded incorrectly (#114)
+
 ## v0.3.1 - 14 June 2014
 
 - Fixed "Token ## not in stream cache" error (#103)

README.md

@@ -4,7 +4,7 @@ GoRethink - RethinkDB Driver for Go [![wercker status](https://app.wercker.com/s
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) made by [Daniel Cannon](http://github.com/dancannon) and based off of Christopher Hesse's [RethinkGo](https://github.com/christopherhesse/rethinkgo) driver.
 
 
-Current version: v0.3.1 (RethinkDB v1.13) 
+Current version: v0.3.2 (RethinkDB v1.13) 
 
 **Version 0.3 introduced some API changes, for more information check the [change log](CHANGELOG.md)**
 

connection.go

@@ -252,7 +252,7 @@ func (c *Connection) SendQuery(s *Session, q *p.Query, t Term, opts map[string]i
 }
 
 func (c *Connection) Close() error {
-	err := c.s.noreplyWaitQuery()
+	err := c.NoreplyWait()
 	if err != nil {
 		return err
 	}
@@ -268,6 +268,23 @@ func (c *Connection) CloseNoWait() error {
 	return c.Conn.Close()
 }
 
+// noreplyWaitQuery sends the NOREPLY_WAIT query to the server.
+// TODO: Removed duplicated functions in connection and session
+// for NoReplyWait
+func (c *Connection) NoreplyWait() error {
+	q := &p.Query{
+		Type:  p.Query_NOREPLY_WAIT.Enum(),
+		Token: proto.Int64(c.s.nextToken()),
+	}
+
+	_, err := c.SendQuery(c.s, q, Term{}, map[string]interface{}{}, false)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func checkErrorResponse(response *p.Response, t Term) error {
 	switch response.GetType() {
 	case p.Response_CLIENT_ERROR:

doc.go

@@ -1,6 +1,6 @@
 // Go driver for RethinkDB
 //
-// Current version: v0.3.1 (RethinkDB v1.13)
+// Current version: v0.3.2 (RethinkDB v1.13)
 // For more in depth information on how to use RethinkDB check out the API docs
 // at http://rethinkdb.com/api
 package gorethink

encoding/encoder.go

@@ -7,7 +7,6 @@ import (
 	"reflect"
 	"runtime"
 	"sort"
-	"time"
 )
 
 // Encode returns the encoded value of v.
@@ -46,8 +45,14 @@ func encode(v reflect.Value) (reflect.Value, error) {
 
 	// Special cases
 	// Time should not be encoded as it is handled by the Expr method
-	if v.Type() == reflect.TypeOf(time.Time{}) {
-		return v, nil
+	for _, hook := range encodeHooks {
+		success, ret, err := hook(v)
+		if err != nil {
+			return ret, err
+		}
+		if success {
+			return ret, nil
+		}
 	}
 
 	switch v.Kind() {

encoding/encoding.go

@@ -0,0 +1,15 @@
+package encoding
+
+import "reflect"
+
+type EncodeHook func(src reflect.Value) (success bool, ret reflect.Value, err error)
+
+var encodeHooks []EncodeHook
+
+func init() {
+	encodeHooks = []EncodeHook{}
+}
+
+func RegisterEncodeHook(hook EncodeHook) {
+	encodeHooks = append(encodeHooks, hook)
+}

query_control.go

@@ -4,7 +4,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/dancannon/gorethink/encoding"
 	p "github.com/dancannon/gorethink/ql2"
 )
 
@@ -73,7 +72,7 @@ func expr(value interface{}, depth int) Term {
 			return makeFunc(val)
 		}
 		if typ.Kind() == reflect.Struct {
-			data, err := encoding.Encode(val)
+			data, err := encode(val)
 
 			if err != nil || data == nil {
 				return Term{

query_transformation_test.go

@@ -142,6 +142,36 @@ func (s *RethinkSuite) TestTransformationOrderByIndex(c *test.C) {
 	})
 }
 
+func (s *RethinkSuite) TestTransformationOrderByIndexAsc(c *test.C) {
+	Db("test").TableCreate("OrderByIndex").Exec(sess)
+	Db("test").Table("test").IndexDrop("OrderByIndex").Exec(sess)
+
+	// Test database creation
+	Db("test").Table("OrderByIndex").IndexCreateFunc("test", Row.Field("num")).Exec(sess)
+	Db("test").Table("OrderByIndex").Insert(noDupNumObjList).Exec(sess)
+
+	query := Db("test").Table("OrderByIndex").OrderBy(OrderByOpts{
+		Index: Asc("test"),
+	})
+
+	var response []interface{}
+	res, err := query.Run(sess)
+	c.Assert(err, test.IsNil)
+
+	err = res.All(&response)
+
+	c.Assert(err, test.IsNil)
+	c.Assert(response, JsonEquals, []interface{}{
+		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
+		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
+		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
+		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
+		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
+		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
+		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
+	})
+}
+
 func (s *RethinkSuite) TestTransformationOrderByMultiple(c *test.C) {
 	query := Expr(objList).OrderBy(Desc("num"), Asc("id"))
 

results.go

@@ -202,16 +202,21 @@ func (c *Cursor) One(result interface{}) error {
 	if c.IsNil() {
 		return ErrEmptyResult
 	}
+
+	var err error
 	ok := c.Next(result)
 	if !ok {
-		err := c.Err()
+		err = c.Err()
 		if err == nil {
-			return ErrEmptyResult
+			err = ErrEmptyResult
 		}
-		return err
 	}
 
-	return c.Close()
+	if e := c.Close(); e != nil {
+		err = e
+	}
+
+	return err
 }
 
 // Tests if the current row is nil.

session.go

@@ -344,11 +344,18 @@ func (s *Session) noreplyWaitQuery() error {
 	}
 
 	conn := s.pool.Get()
-	defer conn.Close()
 
 	_, err := conn.SendQuery(s, q, Term{}, map[string]interface{}{}, false)
+	if err != nil {
+		return err
+	}
 
-	return err
+	err = conn.Close()
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func (s *Session) checkCache(token int64) (*Cursor, bool) {