Skip to content

Commit

Permalink
Support returning any from callbacks
Browse files Browse the repository at this point in the history
Add test

Fix test
  • Loading branch information
eatonphil committed May 13, 2022
1 parent aa1e904 commit 57fe2b7
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
14 changes: 14 additions & 0 deletions callback.go
Expand Up @@ -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())
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
}

fallthrough
case reflect.Slice:
if typ.Elem().Kind() != reflect.Uint8 {
Expand Down
12 changes: 12 additions & 0 deletions callback_test.go
Expand Up @@ -102,3 +102,15 @@ func TestCallbackConverters(t *testing.T) {
}
}
}

func TestCallbackReturnAny(t *testing.T) {
udf := func() interface{} {
return 1
}

typ := reflect.TypeOf(udf)
_, err := callbackRet(typ.Out(0))
if err != nil {
t.Errorf("Expected valid callback for any return type, got: %s", err)
}
}

0 comments on commit 57fe2b7

Please sign in to comment.