fix PutChange with nil value (#6)

Author: Fs02

put_change.go

@@ -16,9 +16,14 @@ func PutChange(ch *Changeset, field string, value interface{}, opts ...Option) {
 	options.apply(opts)
 
 	if typ, exist := ch.types[field]; exist {
-		if value != (interface{})(nil) {
+		if value != nil {
 			valTyp := reflect.TypeOf(value)
 			if valTyp.Kind() == reflect.Ptr {
+				if reflect.ValueOf(value).IsNil() {
+					ch.changes[field] = nil
+					return
+				}
+
 				valTyp = valTyp.Elem()
 			}
 
@@ -27,7 +32,7 @@ func PutChange(ch *Changeset, field string, value interface{}, opts ...Option) {
 				return
 			}
 		} else {
-			ch.changes[field] = reflect.Zero(reflect.PtrTo(typ)).Interface()
+			ch.changes[field] = value
 			return
 		}
 	}

put_change_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/go-rel/changeset/params"
+	"github.com/go-rel/rel"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,26 +41,59 @@ func TestPutChange(t *testing.T) {
 	assert.Equal(t, 10, ch.Changes()["field1"])
 }
 
+func TestPutChange_ptr(t *testing.T) {
+	var (
+		nullable = false
+		a        struct {
+			ID       int
+			Nullable *bool
+		}
+	)
+
+	ch := Cast(a, params.Map{}, []string{})
+	PutChange(ch, "nullable", &nullable)
+
+	assert.Nil(t, ch.Error())
+	assert.Equal(t, &nullable, ch.Changes()["nullable"])
+
+	assert.NotPanics(t, func() {
+		rel.Apply(rel.NewDocument(&a), ch)
+		assert.Equal(t, &nullable, a.Nullable)
+	})
+}
+
 func TestPutChange_nil(t *testing.T) {
 	var a struct {
+		ID       int
 		Nullable *bool
 	}
 
 	ch := Cast(a, params.Map{}, []string{})
 	PutChange(ch, "nullable", nil)
 
 	assert.Nil(t, ch.Error())
-	assert.Equal(t, (*bool)(nil), ch.Changes()["nullable"])
+	assert.Equal(t, nil, ch.Changes()["nullable"])
+
+	assert.NotPanics(t, func() {
+		rel.Apply(rel.NewDocument(&a), ch)
+		assert.Nil(t, a.Nullable)
+	})
 }
 
 func TestPutChange_typedNil(t *testing.T) {
 	var a struct {
+		ID       int
 		Nullable *bool
 	}
 
 	ch := Cast(a, params.Map{}, []string{})
 	PutChange(ch, "nullable", (*bool)(nil))
 
 	assert.Nil(t, ch.Error())
-	assert.Equal(t, (*bool)(nil), ch.Changes()["nullable"])
+	assert.Equal(t, nil, ch.Changes()["nullable"])
+
+	assert.NotPanics(t, func() {
+		rel.Apply(rel.NewDocument(&a), ch)
+		assert.Nil(t, a.Nullable)
+	})
 }

validate_required_test.go

@@ -1,7 +1,6 @@
 package changeset
 
 import (
-	"fmt"
 	"strings"
 	"testing"
 	"time"
@@ -90,7 +89,6 @@ func TestValidateRequired_cast_error(t *testing.T) {
 	}
 
 	ct := customType{Field1: "field1"}
-	fmt.Println(ct.FieldTime)
 	ch := Cast(ct, params.Map{"field2": "field2"}, []string{"field1", "field2", "field3", "field_time"})
 	ValidateRequired(ch, []string{"field1", "field2", "field3", "field_time"})