Skip to content

Support nested UDTs #259

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
thxph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support nested UDTs #259

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
13 changes: 12 additions & 1 deletion udt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ var (
)

type udt struct {
mapper *reflectx.Mapper
field map[string]reflect.Value
value reflect.Value
strict bool
}

func makeUDT(value reflect.Value, mapper *reflectx.Mapper, strict bool) udt {
return udt{
mapper: mapper,
value: value,
field: mapper.FieldMap(value),
strict: strict,
Expand All @@ -40,7 +42,12 @@ func makeUDT(value reflect.Value, mapper *reflectx.Mapper, strict bool) udt {
func (u udt) MarshalUDT(name string, info gocql.TypeInfo) ([]byte, error) {
value, ok := u.field[name]
if ok {
return gocql.Marshal(info, value.Interface())
switch info.(type) {
case gocql.UDTTypeInfo:
return gocql.Marshal(info, makeUDT(value, u.mapper, u.strict))
default:
return gocql.Marshal(info, value.Interface())
}
}
if !u.strict {
return nil, nil
Expand All @@ -51,6 +58,10 @@ func (u udt) MarshalUDT(name string, info gocql.TypeInfo) ([]byte, error) {
func (u udt) UnmarshalUDT(name string, info gocql.TypeInfo, data []byte) error {
value, ok := u.field[name]
if ok {
if value.Addr().Type().Implements(autoUDTInterface) {
return gocql.Unmarshal(info, data, makeUDT(value.Addr(), u.mapper, u.strict))
}

return gocql.Unmarshal(info, data, value.Addr().Interface())
}
if !u.strict {
Expand Down