Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: multiple interfaces cause the original type to be inaccessible #2915

Merged
merged 2 commits into from
Sep 4, 2023
Merged

fix: multiple interfaces cause the original type to be inaccessible #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42a7781
fix: multiple interfaces cause the original type to be inaccessible
wlynxg Aug 30, 2023
4081869
test: add unit tests
wlynxg Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion util/gconv/gconv_convert.go
View file
Open in desktop
Expand Up @@ -194,7 +194,7 @@ func doConvert(in doConvertInput) (convertedValue interface{}) {
}
return Time(in.FromValue)
case "*time.Time":
var v interface{}
var v time.Time
if len(in.Extra) > 0 {
v = Time(in.FromValue, String(in.Extra[0]))
} else {
Expand Down
25 changes: 25 additions & 0 deletions util/gconv/gconv_z_unit_converter_test.go
View file
Open in desktop
Expand Up @@ -8,7 +8,9 @@ package gconv_test

import (
"testing"
"time"

"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
)
Expand Down Expand Up @@ -43,6 +45,12 @@ func TestConverter_Struct(t *testing.T) {
ValTa tB
}

type tEE struct {
Val1 time.Time `json:"val1"`
Val2 *time.Time `json:"val2"`
Val3 *time.Time `json:"val3"`
}

gtest.C(t, func(t *gtest.T) {
a := &tA{
Val: 1,
Expand Down Expand Up @@ -174,6 +182,23 @@ func TestConverter_Struct(t *testing.T) {
t.Assert(dd.ValTa.Val1, 234)
t.Assert(dd.ValTa.Val2, "abc")
})

// fix: https://github.com/gogf/gf/issues/2665
gtest.C(t, func(t *gtest.T) {
aa := &tEE{}

var tmp = map[string]any{
"val1": "2023-04-15 19:10:00 +0800 CST",
"val2": "2023-04-15 19:10:00 +0800 CST",
"val3": "2006-01-02T15:04:05Z07:00",
}
err := gconv.Struct(tmp, aa)
t.AssertNil(err)
t.AssertNE(aa, nil)
t.Assert(aa.Val1.Local(), gtime.New("2023-04-15 19:10:00 +0800 CST").Local().Time)
t.Assert(aa.Val2.Local(), gtime.New("2023-04-15 19:10:00 +0800 CST").Local().Time)
t.Assert(aa.Val3.Local(), gtime.New("2006-01-02T15:04:05Z07:00").Local().Time)
})
}

func TestConverter_CustomBasicType_ToStruct(t *testing.T) {
Expand Down