Null dates should unmarshal as zero dates

aodin · Dec 21, 2015 · f3e4e65 · f3e4e65
1 parent 27ee7c2
commit f3e4e65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/date.go b/date.go
@@ -42,6 +42,9 @@ func (date Date) Equals(other Date) bool {
 // UnmarshalJSON converts a byte array into a Date
 func (d *Date) UnmarshalJSON(text []byte) error {
 	if string(text) == "null" {
+		// Nulls are converted to zero times
+		var zero Date
+		*d = zero
 		return nil
 	}
 	b := bytes.NewBuffer(text)

diff --git a/range_test.go b/range_test.go
@@ -137,8 +137,10 @@ func TestRange_Union(t *testing.T) {
 }
 
 func TestRange_Unmarshal(t *testing.T) {
+	// Unmarshaling should overwrite values
+	open := EntireMonth(2015, 2)
+
 	raw := `{"start":"2015-03-01","end":null}`
-	var open Range
 	assert.Nil(t, json.Unmarshal([]byte(raw), &open))
 	assert.Equal(t, New(2015, 3, 1), open.Start)
 	assert.True(t, open.End.IsZero())