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
Support returning any from callbacks #1046
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -353,13 +353,27 @@ func callbackRetNil(ctx *C.sqlite3_context, v reflect.Value) error { | |
return nil | ||
} | ||
|
||
func callbackRetAny(ctx *C.sqlite3_context, v reflect.Value) error { | ||
cb, err := callbackRet(v.Elem().Type()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is possible that the callback returned There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you mean I should have a check after the err check like
? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it would be this: if v.IsNil() {
C.sqlite3_result_null(ctx)
return nil
}
ve := v.Elem()
cb, err := callbackRet(ve.Type())
if err != nil {
return err
}
return cb(ctx, ve) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Applied, thank you! |
||
if err != nil { | ||
return err | ||
} | ||
|
||
return cb(ctx, v.Elem()) | ||
} | ||
|
||
func callbackRet(typ reflect.Type) (callbackRetConverter, error) { | ||
switch typ.Kind() { | ||
case reflect.Interface: | ||
errorInterface := reflect.TypeOf((*error)(nil)).Elem() | ||
if typ.Implements(errorInterface) { | ||
return callbackRetNil, nil | ||
} | ||
|
||
if typ.NumMethod() == 0 { | ||
return callbackRetAny, nil | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I added a test for this part. But I'm not sure how to add a unit test for the callbackRetAny (I tested it manually end-to-end). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can write a test that registers and uses such an aggregator, similar to this test. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perfect, thank you! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pushed a test. |
||
|
||
fallthrough | ||
case reflect.Slice: | ||
if typ.Elem().Kind() != reflect.Uint8 { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably should be
callbackRetGeneric
for consistency withcallbackArgGeneric
. Or rename the other one tocallbackArgAny
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adjusted, thanks!