it works

Author: DifferentialOrange

box_error.go

@@ -129,12 +129,12 @@ func decodeBoxError(d *decoder) (*BoxError, error) {
 }
 
 func msgpackDecodeBoxError(d *decoder, v reflect.Value) (err error) {
-	boxError, err := decodeBoxError(d)
+	boxErrorPtr, err := decodeBoxError(d)
 	if err != nil {
 		return err
 	}
 
-	v.Set(reflect.ValueOf(boxError))
+	v.Set(reflect.ValueOf(*boxErrorPtr))
 	return nil
 }
 
@@ -152,9 +152,9 @@ func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
 	}
 
 	for ; stackDepth > 0; stackDepth-- {
-		isWithFields := (len(boxError.Fields) > 0)
+		fieldsLen := len(boxError.Fields)
 
-		if isWithFields {
+		if fieldsLen > 0 {
 			if err = enc.EncodeMapLen(7); err != nil {
 				return err
 			}
@@ -185,13 +185,6 @@ func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
 			return err
 		}
 
-		if err = encodeUint(enc, KeyErrorFile); err != nil {
-			return err
-		}
-		if err = enc.EncodeString(boxError.File); err != nil {
-			return err
-		}
-
 		if err = encodeUint(enc, KeyErrorMessage); err != nil {
 			return err
 		}
@@ -213,11 +206,15 @@ func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
 			return err
 		}
 
-		if isWithFields {
+		if fieldsLen > 0 {
 			if err = encodeUint(enc, KeyErrorFields); err != nil {
 				return err
 			}
 
+			if err = enc.EncodeMapLen(fieldsLen); err != nil {
+				return err
+			}
+
 			for k, v := range boxError.Fields {
 				if err = enc.Encode(k); err != nil {
 					return err
@@ -227,6 +224,10 @@ func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
 				}
 			}
 		}
+
+		if stackDepth > 1 {
+			boxError = *boxError.Prev
+		}
 	}
 
 	return nil

error_ext_test.go

@@ -1,6 +1,8 @@
 package tarantool_test
 
 import (
+	"fmt"
+	"reflect"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -17,6 +19,38 @@ func skipIfErrorExtUnsupported(t *testing.T) {
 	}
 }
 
+type TupleError struct {
+	val BoxError
+}
+
+func (t *TupleError) EncodeMsgpack(e *encoder) error {
+	if err := e.EncodeArrayLen(1); err != nil {
+		return err
+	}
+	return e.EncodeValue(reflect.ValueOf(&t.val))
+}
+
+func (t *TupleError) DecodeMsgpack(d *decoder) error {
+	var err error
+	var l int
+	if l, err = d.DecodeArrayLen(); err != nil {
+		return err
+	}
+	if l != 1 {
+		return fmt.Errorf("Array length doesn't match: %d", l)
+	}
+
+	res, err := d.DecodeInterface()
+	if err != nil {
+		return err
+	}
+	var ok bool
+	if t.val, ok = toBoxError(res); !ok {
+		return fmt.Errorf("BoxError doesn't match")
+	}
+	return nil
+}
+
 var samples = []struct {
 	goErr     BoxError
 	mpBuf     string
@@ -87,14 +121,15 @@ func TestErrorExtMPEncodeDecode(t *testing.T) {
 		t.Run(testcase.ttErrName, func(t *testing.T) {
 			var buf []byte
 			var err error
-			if buf, err = marshal(testcase.goErr); err != nil {
+			tuple := TupleError{val: testcase.goErr}
+			if buf, err = marshal(&tuple); err != nil {
 				t.Fatalf("Failed to encode error ext type '%v' to a MessagePack buffer: %s", testcase.goErr, err)
 			}
-			var v BoxError
+			var v TupleError
 			if err = unmarshal(buf, &v); err != nil {
 				t.Fatalf("Failed to decode MessagePack buffer '%x' to a error ext type: %s", buf, err)
 			}
-			require.Equal(t, v, testcase.goErr)
+			require.Equal(t, v.val, testcase.goErr)
 		})
 	}
 }

example_test.go

@@ -329,7 +329,7 @@ func ExampleProtocolVersion() {
 	fmt.Println("Connector client protocol features:", clientProtocolInfo.Features)
 	// Output:
 	// Connector client protocol version: 4
-	// Connector client protocol features: [StreamsFeature TransactionsFeature]
+	// Connector client protocol features: [StreamsFeature TransactionsFeature ErrorExtensionFeature]
 }
 
 func ExampleCommitRequest() {

tarantool_test.go

@@ -2868,7 +2868,7 @@ func TestConnectionProtocolInfoSupported(t *testing.T) {
 	require.Equal(t,
 		clientProtocolInfo,
 		ProtocolInfo{
-			Version:  ProtocolVersion(4),
+			Version: ProtocolVersion(4),
 			Features: []ProtocolFeature{
 				StreamsFeature,
 				TransactionsFeature,
@@ -3222,7 +3222,7 @@ func TestExtraErrorInfoFields(t *testing.T) {
 	defer conn.Close()
 
 	// "test" user cannot create functions
-	_, err := conn.Eval("box.schema.func.create('forbidden_function')", []interface{}{})
+	_, err := conn.Eval("error(access_denied_error)", []interface{}{})
 	require.NotNilf(t, err, "expected error on forbidden action")
 
 	terr, ok := err.(Error)
@@ -3235,15 +3235,15 @@ func TestExtraErrorInfoFields(t *testing.T) {
 	require.Greaterf(t, terr.ExtraInfo.Line, int64(0), "line info not empty")
 	require.Equal(t,
 		terr.ExtraInfo.Message,
-		"Create access to function 'forbidden_function' is denied for user 'test'")
+		"Execute access to function 'forbidden_function' is denied for user 'no_grants'")
 	require.Equal(t, terr.ExtraInfo.Errno, int64(0))
 	require.Equal(t, terr.ExtraInfo.Errcode, int64(42))
 	require.Equal(t,
 		terr.ExtraInfo.Fields,
 		map[interface{}]interface{}{
 			"object_type": "function",
 			"object_name": "forbidden_function",
-			"access_type": "Create",
+			"access_type": "Execute",
 		})
 	require.Nilf(t, terr.ExtraInfo.Prev, "stack contains exactly one error")
 }