GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return first err in decodeJSONB 

fixes #212
pull/220/head
Jack Christensen 2016-11-23 12:29:21 -06:00
parent db13650410
commit c952d48a5c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
values.go
View File

@ -2081,12 +2081,16 @@ func decodeJSONB(vr *ValueReader, d interface{}) error {
} }
if vr.Type().DataType != JsonbOid { if vr.Type().DataType != JsonbOid {
vr.Fatal(ProtocolError(fmt.Sprintf("Cannot decode oid %v into jsonb", vr.Type().DataType))) err := ProtocolError(fmt.Sprintf("Cannot decode oid %v into jsonb", vr.Type().DataType))
vr.Fatal(err)
return err
} }
bytes := vr.ReadBytes(vr.Len()) bytes := vr.ReadBytes(vr.Len())
if bytes[0] != 1 { if bytes[0] != 1 {
vr.Fatal(ProtocolError(fmt.Sprintf("Unknown jsonb format byte: %x", bytes[0]))) err := ProtocolError(fmt.Sprintf("Unknown jsonb format byte: %x", bytes[0]))
vr.Fatal(err)
return err
} }
err := json.Unmarshal(bytes[1:], d) err := json.Unmarshal(bytes[1:], d)