Fixed time.Time values ignoring the omitempty tag. Fixes #176.

Author: dancannon

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+### Fixed
+- Fixed bug causing empty times to be inserted into the DB even when the omitempty tag was set.
+
 ## v0.7.0 - 2015-03-30
 
 This release includes support for RethinkDB 2.0 and connecting to clusters. To connect to a cluster you should use the new `Addresses` field in `ConnectOpts`, for example:

encoding/encoder_test.go

@@ -4,6 +4,7 @@ import (
 	"image"
 	"reflect"
 	"testing"
+	"time"
 )
 
 var encodeExpected = map[string]interface{}{
@@ -74,6 +75,9 @@ type Optionals struct {
 	Ir int `gorethink:"omitempty"` // actually named omitempty, not an option
 	Io int `gorethink:"io,omitempty"`
 
+	Tr time.Time `gorethink:"tr"`
+	To time.Time `gorethink:"to,omitempty"`
+
 	Slr []string `gorethink:"slr"`
 	Slo []string `gorethink:"slo,omitempty"`
 
@@ -84,22 +88,24 @@ type Optionals struct {
 var optionalsExpected = map[string]interface{}{
 	"sr":        "",
 	"omitempty": int64(0),
+	"tr":        map[string]interface{}{"$reql_type$": "TIME", "epoch_time": 0, "timezone": "+00:00"},
 	"slr":       []interface{}{},
 	"mr":        map[string]interface{}{},
 }
 
 func TestOmitEmpty(t *testing.T) {
 	var o Optionals
 	o.Sw = "something"
+	o.Tr = time.Unix(0, 0)
 	o.Mr = map[string]interface{}{}
 	o.Mo = map[string]interface{}{}
 
 	got, err := Encode(&o)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !reflect.DeepEqual(got, optionalsExpected) {
-		t.Errorf(" got: %v\nwant: %v\n", got, optionalsExpected)
+	if !jsonEqual(got, optionalsExpected) {
+		t.Errorf("\ngot:  %#v\nwant: %#v\n", got, optionalsExpected)
 	}
 }
 

encoding/encoder_types.go

@@ -133,7 +133,7 @@ func (se *structEncoder) encode(v reflect.Value) interface{} {
 
 	for i, f := range se.fields {
 		fv := fieldByIndex(v, f.index)
-		if !fv.IsValid() || f.omitEmpty && isEmptyValue(fv) {
+		if !fv.IsValid() || f.omitEmpty && se.isEmptyValue(fv) {
 			continue
 		}
 
@@ -143,6 +143,14 @@ func (se *structEncoder) encode(v reflect.Value) interface{} {
 	return m
 }
 
+func (se *structEncoder) isEmptyValue(v reflect.Value) bool {
+	if v.Type() == timeType {
+		return v.Interface().(time.Time) == time.Time{}
+	}
+
+	return isEmptyValue(v)
+}
+
 func newStructEncoder(t reflect.Type) encoderFunc {
 	fields := cachedTypeFields(t)
 	se := &structEncoder{