Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions snowflake.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,13 +354,13 @@ func (f ID) MarshalJSON() ([]byte, error) {

// UnmarshalJSON converts a json byte array of a snowflake ID into an ID type.
func (f *ID) UnmarshalJSON(b []byte) error {
if len(b) < 3 || b[0] != '"' || b[len(b)-1] != '"' {
return JSONSyntaxError{b}
if len(b) >= 3 && b[0] == '"' && b[len(b)-1] == '"' {
b = b[1 : len(b)-1]
}

i, err := strconv.ParseInt(string(b[1:len(b)-1]), 10, 64)
i, err := strconv.ParseInt(string(b), 10, 64)
if err != nil {
return err
return JSONSyntaxError{b}
}

*f = ID(i)
Expand Down
9 changes: 8 additions & 1 deletion snowflake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,14 @@ func TestUnmarshalJSON(t *testing.T) {
expectedErr error
}{
{`"13587"`, 13587, nil},
{`1`, 0, JSONSyntaxError{[]byte(`1`)}},
{`1`, 1, nil},
{`12`, 12, nil},
{`13587`, 13587, nil},
{``, 0, JSONSyntaxError{[]byte(``)}},
{`"1`, 0, JSONSyntaxError{[]byte(`"1`)}},
{`1"`, 0, JSONSyntaxError{[]byte(`1"`)}},
{`12"`, 0, JSONSyntaxError{[]byte(`12"`)}},
{`"12`, 0, JSONSyntaxError{[]byte(`"12`)}},
{`"invalid`, 0, JSONSyntaxError{[]byte(`"invalid`)}},
}

Expand Down