omitempty: don't call value receiver IsZero for nil ptrs

fixes #101
guregu · Jul 18, 2019 · 019aa7b · 019aa7b
1 parent 305af82
commit 019aa7b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/encode.go b/encode.go
@@ -430,6 +430,12 @@ func isZero(rv reflect.Value) bool {
 	// use IsZero for supported types
 	if rv.CanInterface() {
 		if zeroer, ok := rv.Interface().(isZeroer); ok {
+			if rv.Kind() == reflect.Ptr && rv.IsNil() {
+				if _, cantCall := rv.Type().Elem().MethodByName("IsZero"); cantCall {
+					// can't call a value method on a nil pointer type
+					return true
+				}
+			}
 			return zeroer.IsZero()
 		}
 	}

diff --git a/encoding_test.go b/encoding_test.go
@@ -205,8 +205,10 @@ var itemEncodingTests = []struct {
 	{
 		name: "omitempty",
 		in: struct {
-			A     bool `dynamo:",omitempty"`
-			Other bool
+			A       bool       `dynamo:",omitempty"`
+			B       *bool      `dynamo:",omitempty"`
+			NilTime *time.Time `dynamo:",omitempty"`
+			Other   bool
 		}{
 			Other: true,
 		},