Skip to content

Do not attempt to traverse the fields of an anonymous pseudo-type #304

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

Merged
merged 3 commits into from
Apr 18, 2016
Merged

Do not attempt to traverse the fields of an anonymous pseudo-type #304

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5166a5b
dancannon/gorethink#301 Do not attempt to traverse the fields of an
ereyes01 Apr 13, 2016
afb7729
Merge branch 'master' into anon_time
ereyes01 Apr 13, 2016
804c10a
Merge branch 'master' into anon_time
ereyes01 Apr 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion encoding/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"reflect"
"sort"
"sync"
"time"
)

// A field represents a single field found in a struct.
Expand Down Expand Up @@ -131,7 +132,7 @@ func typeFields(t reflect.Type) []field {
}

// Record found field and index sequence.
if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct {
if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct || isPseudoType(ft) {
tagged := name != ""
if name == "" {
name = sf.Name
Expand Down Expand Up @@ -200,6 +201,10 @@ func typeFields(t reflect.Type) []field {
return fields
}

func isPseudoType(t reflect.Type) bool {
return t == reflect.TypeOf(time.Time{})
}

// dominantField looks through the fields, all of which are known to
// have the same name, to find the single field that dominates the
// others using Go's embedding rules, modified by the presence of
Expand Down