Fixed some null/nil values not being decoded properly. Fixes #69

Author: dancannon

encoding/decoder.go

@@ -3,31 +3,33 @@
 package encoding
 
 import (
-	"errors"
+
+	// "errors"
 	"reflect"
-	"runtime"
+	// "runtime"
 	"strconv"
 	"strings"
 )
 
 // Decode decodes map[string]interface{} into a struct. The first parameter
 // must be a pointer.
 func Decode(dst interface{}, src interface{}) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			if v, ok := r.(string); ok {
-				err = errors.New(v)
-			} else {
-				err = r.(error)
-			}
-		}
-	}()
+	// defer func() {
+	// 	if r := recover(); r != nil {
+	// 		if _, ok := r.(runtime.Error); ok {
+	// 			panic(r)
+	// 		}
+	// 		if v, ok := r.(string); ok {
+	// 			err = errors.New(v)
+	// 		} else {
+	// 			err = r.(error)
+	// 		}
+	// 	}
+	// }()
 
 	dv := reflect.ValueOf(dst)
 	sv := reflect.ValueOf(src)
+
 	if dv.Kind() != reflect.Ptr || dv.IsNil() {
 		return &InvalidDecodeError{reflect.TypeOf(dst)}
 	}
@@ -419,6 +421,10 @@ func decodeObjectInterface(s *decodeState, sv reflect.Value) map[string]interfac
 
 // decodeLiteralInterface returns the interface of the source value
 func decodeLiteralInterface(s *decodeState, sv reflect.Value) interface{} {
+	if !sv.IsValid() {
+		return nil
+	}
+
 	return sv.Interface()
 }
 

results.go

@@ -104,9 +104,7 @@ func (r *ResultRows) Next() bool {
 		}
 
 		r.current = row
-		if row != nil {
-			return true
-		}
+		return true
 	}
 
 	// Check if all rows have been loaded

results_test.go

@@ -36,19 +36,23 @@ func (s *RethinkSuite) TestRowsScanSlice(c *test.C) {
 }
 
 func (s *RethinkSuite) TestRowsPartiallyNilSlice(c *test.C) {
-	row, err := Expr([]interface{}{
-		map[string]interface{}{"num": 1},
-		map[string]interface{}{"num": 2},
-		nil,
-		nil,
-		map[string]interface{}{"num": 5},
-	}).Run(sess)
+	row, err := Expr(map[string]interface{}{
+		"item": []interface{}{
+			map[string]interface{}{"num": 1},
+			nil,
+		},
+	}).RunRow(sess)
 	c.Assert(err, test.IsNil)
 
-	var response []interface{}
-	err = row.ScanAll(&response)
+	var response map[string]interface{}
+	err = row.Scan(&response)
 	c.Assert(err, test.IsNil)
-	c.Assert(response, JsonEquals, []interface{}{1, 2, nil, nil, 5})
+	c.Assert(response, JsonEquals, map[string]interface{}{
+		"item": []interface{}{
+			map[string]interface{}{"num": 1},
+			nil,
+		},
+	})
 }
 
 func (s *RethinkSuite) TestRowsScanMap(c *test.C) {