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.

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

CASSGO-38 Marshal error messages enhancement #1838

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from

Conversation

tengu-alt
Copy link
Contributor

This PR provides marshal/unmarshal error messages enhancement.
According to #671 errors were updated by the supported types list.

@tengu-alt tengu-alt force-pushed the marshal-errors-enhancement branch from bb0dab6 to c3dcd98 Compare October 30, 2024 12:02
marshal.go Outdated
@@ -333,7 +333,7 @@ func marshalVarchar(info TypeInfo, value interface{}) ([]byte, error) {
case k == reflect.Slice && t.Elem().Kind() == reflect.Uint8:
return rv.Bytes(), nil
}
return nil, marshalErrorf("can not marshal %T into %s", value, info)
return nil, marshalErrorf("can not marshal %T into %s. Accepted types: Marshaler, string, []byte, unsetColumn.", value, info)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unsetColumn is not an exported type, so the driver doesn't have to expose it to the user. There is a UnsetValue global var of type unsetColumn which is meant to be used to ignore writing. You can find it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, refactored

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant to change unsetColumn to UnsetValue, not to delete it at all

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, fixed.

marshal.go Outdated
@@ -2280,7 +2280,7 @@ func marshalUDT(info TypeInfo, value interface{}) ([]byte, error) {
}

if k.Kind() != reflect.Struct || !k.IsValid() {
return nil, marshalErrorf("cannot marshal %T into %s", value, info)
return nil, marshalErrorf("cannot marshal %T into %s. Accepted types: Marshaler, unsetColumn, UDTMarshaler, UDTMarshaler, map[string]interface{}, struct.", value, info)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here UDTMarshaler is duplicated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

@tengu-alt tengu-alt force-pushed the marshal-errors-enhancement branch 3 times, most recently from f4a0127 to dbec58a Compare October 31, 2024 12:50
@tengu-alt tengu-alt force-pushed the marshal-errors-enhancement branch from dbec58a to d6550c9 Compare November 20, 2024 11:10
@ribaraka
Copy link

marshal.go Outdated
@@ -2208,7 +2210,7 @@ func unmarshalTuple(info TypeInfo, data []byte, value interface{}) error {
return nil
}

return unmarshalErrorf("cannot unmarshal %s into %T", info, value)
return unmarshalErrorf("cannot unmarshal %s into %T. Accepted types: struct, []interface{}, array, slice.", info, value)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unmarshaler is also accepted I think. Also the accepted types other than []interface{} have to be a pointer if I'm reading the code correctly (so *struct, *array, *slice)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Thank you.

marshal.go Show resolved Hide resolved
marshal.go Outdated
@@ -1706,7 +1708,7 @@ func unmarshalList(info TypeInfo, data []byte, value interface{}) error {
}
return nil
}
return unmarshalErrorf("can not unmarshal %s into %T", info, value)
return unmarshalErrorf("can not unmarshal %s into %T. Accepted types: slice, array.", info, value)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it has to be *slice, *array

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

marshal.go Outdated
@@ -2392,7 +2394,7 @@ func unmarshalUDT(info TypeInfo, data []byte, value interface{}) error {
}
k := rv.Elem()
if k.Kind() != reflect.Struct || !k.IsValid() {
return unmarshalErrorf("cannot unmarshal %s into %T", info, value)
return unmarshalErrorf("cannot unmarshal %s into %T. Accepted types: Unmarshaler, UDTUnmarshaler, *map[string]interface{}, struct.", info, value)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*struct

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@joao-r-reis joao-r-reis changed the title Marshal error messages enhancement CASSGO-38 Marshal error messages enhancement Nov 22, 2024
@tengu-alt tengu-alt force-pushed the marshal-errors-enhancement branch from d6550c9 to 74254c8 Compare November 22, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants