Merge pull request #240 from bithavoc/use_json_numbers

UseJSONNumber

Author: dancannon

cursor.go

@@ -1,6 +1,7 @@
 package gorethink
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"reflect"
@@ -200,7 +201,11 @@ func (c *Cursor) loadNextLocked(dest interface{}) (bool, error) {
 		if c.buffer.Len() == 0 && c.responses.Len() > 0 {
 			if response, ok := c.responses.Pop().(json.RawMessage); ok {
 				var value interface{}
-				err := json.Unmarshal(response, &value)
+				decoder := json.NewDecoder(bytes.NewBuffer(response))
+				if c.conn.opts.UseJSONNumber {
+					decoder.UseNumber()
+				}
+				err := decoder.Decode(&value)
 				if err != nil {
 					return false, err
 				}

query_select_test.go

@@ -1,6 +1,7 @@
 package gorethink
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/rand"
 	"testing"
@@ -31,6 +32,35 @@ func (s *RethinkSuite) TestSelectGet(c *test.C) {
 	res.Close()
 }
 
+func (s *RethinkSuite) TestSelectJSONNumbers(c *test.C) {
+	session, err := Connect(ConnectOpts{
+		Address:       url,
+		AuthKey:       authKey,
+		UseJSONNumber: true,
+	})
+	c.Assert(err, test.IsNil)
+	defer session.Close()
+	// Ensure table + database exist
+	DBCreate("test").Exec(session)
+	DB("test").TableCreate("Table1").Exec(session)
+
+	// Insert rows
+	DB("test").Table("Table1").Insert(objList).Exec(session)
+
+	// Test query
+	var response interface{}
+	query := DB("test").Table("Table1").Get(6)
+	res, err := query.Run(session)
+	c.Assert(err, test.IsNil)
+
+	err = res.One(&response)
+
+	c.Assert(err, test.IsNil)
+	c.Assert(response, jsonEquals, map[string]interface{}{"id": json.Number("6"), "g1": json.Number("1"), "g2": json.Number("1"), "num": json.Number("15")})
+
+	res.Close()
+}
+
 func (s *RethinkSuite) TestSelectGetAll(c *test.C) {
 	// Ensure table + database exist
 	DBCreate("test").Exec(session)

session.go

@@ -43,6 +43,10 @@ type ConnectOpts struct {
 	// NodeRefreshInterval is used to determine how often the driver should
 	// refresh the status of a node.
 	NodeRefreshInterval time.Duration `gorethink:"node_refresh_interval,omitempty"`
+
+	// 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
 }
 
 func (o *ConnectOpts) toMap() map[string]interface{} {