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

GODRIVER-1919 Add object id decoder awareness of string hex #610

Merged
merged 2 commits into from
Mar 17, 2021
Merged

GODRIVER-1919 Add object id decoder awareness of string hex #610

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
bddde89
GODRIVER-1919 Add object id decoder awareness of string hex
glossd Mar 14, 2021
2b299f1
GODRIVER-1919 object id decoder, clarifying comment
glossd Mar 17, 2021
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
4 changes: 4 additions & 0 deletions bson/bsoncodec/default_value_decoders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,7 @@ func (dvd DefaultValueDecoders) UndefinedDecodeValue(dc DecodeContext, vr bsonrw
return nil
}

// Accept both 12-byte string and pretty-printed 24-byte hex string formats.
func (dvd DefaultValueDecoders) objectIDDecodeType(dc DecodeContext, vr bsonrw.ValueReader, t reflect.Type) (reflect.Value, error) {
if t != tOID {
return emptyValue, ValueDecoderError{
Expand All @@ -740,6 +741,9 @@ func (dvd DefaultValueDecoders) objectIDDecodeType(dc DecodeContext, vr bsonrw.V
if err != nil {
return emptyValue, err
}
if oid, err = primitive.ObjectIDFromHex(str); err == nil {
divjotarora marked this conversation as resolved.
Show resolved Hide resolved
break
}
if len(str) != 12 {
return emptyValue, fmt.Errorf("an ObjectID string must be exactly 12 bytes long (got %v)", len(str))
}
Expand Down
11 changes: 11 additions & 0 deletions bson/bsoncodec/default_value_decoders_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,17 @@ func TestDefaultValueDecoders(t *testing.T) {
bsonrwtest.ReadString,
nil,
},
{
"success/string-hex",
primitive.ObjectID{0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x61, 0x62},
nil,
&bsonrwtest.ValueReaderWriter{
BSONType: bsontype.String,
Return: "303132333435363738396162",
},
bsonrwtest.ReadString,
nil,
},
{
"decode null",
primitive.ObjectID{},
Expand Down