More fixes

rethinkdb · Feb 15, 2015 · d8c38c9 · d8c38c9
1 parent 8e0e95f
commit d8c38c9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/connection_helper.go b/connection_helper.go
@@ -67,7 +67,7 @@ func (c *Connection) readHandshakeSuccess() error {
 	return nil
 }
 
-func (c *Connection) writeQueryg(token int64, q []byte) error {
+func (c *Connection) writeQuery(token int64, q []byte) error {
 	pos := 0
 	dataLen := 8 + 4 + len(q)
 

diff --git a/encoding/decoder.go b/encoding/decoder.go
@@ -69,6 +69,11 @@ func valueDecoder(dv, sv reflect.Value) decoderFunc {
 		return invalidValueDecoder
 	}
 
+	if dv.IsValid() {
+		dv = indirect(dv, false)
+		dv.Set(reflect.Zero(dv.Type()))
+	}
+
 	return typeDecoder(dv.Type(), sv.Type())
 }
 

diff --git a/types/geometry.go b/types/geometry.go
@@ -1,6 +1,8 @@
 package types
 
-import "fmt"
+import (
+	"fmt"
+)
 
 type Geometry struct {
 	Type  string
@@ -23,6 +25,15 @@ func (g Geometry) MarshalRQL() (interface{}, error) {
 }
 
 func (g *Geometry) UnmarshalRQL(data interface{}) error {
+	if data, ok := data.(Geometry); ok {
+		g.Type = data.Type
+		g.Point = data.Point
+		g.Line = data.Line
+		g.Lines = data.Lines
+
+		return nil
+	}
+
 	m, ok := data.(map[string]interface{})
 	if !ok {
 		return fmt.Errorf("pseudo-type GEOMETRY object is not valid")

diff --git a/wercker.yml b/wercker.yml
@@ -31,7 +31,7 @@ build:
             name: Test
             code: |-
                 go get -u gopkg.in/check.v1
-                go test ./...
+                go test ./... -short
         - script:
             name: Store cache
             code: |-