Skip to content

fix: case-insensitive key match for structs with more than 16 fields (#427) #608

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

Open
chiliec wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −2
Open

fix: case-insensitive key match for structs with more than 16 fields (#427) #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 37 additions & 0 deletions decode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4057,3 +4057,40 @@ func TestIssue429(t *testing.T) {
}
}
}

func TestIssue427(t *testing.T) {
type Entity struct {
SomeField1 string
SomeField2 string
SomeField3 string
SomeField4 string
SomeField5 string
SomeField6 string
SomeField7 string
SomeField8 string
SomeField9 string
SomeField10 string
SomeField11 string
SomeField12 string
SomeField13 string
SomeField14 string
SomeField15 string
SomeField16 string
SomeField17 string
}
const src = `{"someField1":"v1","someField17":"v17"}`

var got Entity
if err := json.Unmarshal([]byte(src), &got); err != nil {
t.Fatal(err)
}
assertEq(t, "unmarshal first field", "v1", got.SomeField1)
assertEq(t, "unmarshal last field", "v17", got.SomeField17)

var stream Entity
if err := json.NewDecoder(strings.NewReader(src)).Decode(&stream); err != nil {
t.Fatal(err)
}
assertEq(t, "stream first field", "v1", stream.SomeField1)
assertEq(t, "stream last field", "v17", stream.SomeField17)
}
11 changes: 9 additions & 2 deletions internal/decoder/struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,10 @@ func decodeKey(d *structDecoder, buf []byte, cursor int64) (int64, *structFieldS
k := *(*string)(unsafe.Pointer(&key))
field, exists := d.fieldMap[k]
if !exists {
return cursor, nil, nil
field, exists = d.fieldMap[strings.ToLower(k)]
if !exists {
return cursor, nil, nil
}
}
return cursor, field, nil
}
Expand Down Expand Up @@ -657,7 +660,11 @@ func decodeKeyStream(d *structDecoder, s *Stream) (*structFieldSet, string, erro
return nil, "", err
}
k := *(*string)(unsafe.Pointer(&key))
return d.fieldMap[k], k, nil
field, exists := d.fieldMap[k]
if !exists {
field = d.fieldMap[strings.ToLower(k)]
}
return field, k, nil
}

func (d *structDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) error {
Expand Down