vitessdriver: send string for binary result values (#19542)

Signed-off-by: Derek Perkins <derek@nozzle.io>

Author: vitess-bot[bot]

go/vt/vitessdriver/convert.go

@@ -45,10 +45,6 @@ func (cv *converter) ToNative(v sqltypes.Value) (any, error) {
 		return v.ToFloat64()
 	case v.Type() == sqltypes.Datetime, v.Type() == sqltypes.Timestamp, v.Type() == sqltypes.Date:
 		return v.ToTime(cv.location)
-	case v.IsBinary():
-		// sending through string values matches the behavior in go-sql-driver and
-		// is necessary for json values to be handled without erroring in vttablet.
-		out = v.ToString()
 	case v.IsQuoted() || v.Type() == sqltypes.Bit || v.Type() == sqltypes.Decimal:
 		out, err = v.ToBytes()
 	case v.Type() == sqltypes.Expression:
@@ -58,10 +54,19 @@ func (cv *converter) ToNative(v sqltypes.Value) (any, error) {
 }
 
 func (cv *converter) BuildBindVariable(v any) (*querypb.BindVariable, error) {
-	if t, ok := v.(time.Time); ok {
+	switch t := v.(type) {
+	case time.Time:
 		return sqltypes.ValueBindVariable(NewDatetime(t, cv.location)), nil
+	case []byte:
+		if t == nil {
+			return sqltypes.NullBindVariable, nil
+		}
+		// sending through string values matches the behavior in go-sql-driver and
+		// is necessary for json values to be handled without erroring in vttablet.
+		return sqltypes.StringBindVariable(string(t)), nil
+	default:
+		return sqltypes.BuildBindVariable(v)
 	}
-	return sqltypes.BuildBindVariable(v)
 }
 
 // populateRow populates a row of data using the table's field descriptions.

go/vt/vitessdriver/convert_test.go

@@ -17,11 +17,13 @@ limitations under the License.
 package vitessdriver
 
 import (
-	"reflect"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"vitess.io/vitess/go/sqltypes"
+	querypb "vitess.io/vitess/go/vt/proto/query"
 )
 
 func TestToNative(t *testing.T) {
@@ -147,7 +149,7 @@ func TestToNative(t *testing.T) {
 		{
 			convert: &converter{},
 			in:      sqltypes.TestValue(sqltypes.Blob, "a"),
-			out:     "a",
+			out:     []byte("a"),
 		},
 		{
 			convert: &converter{},
@@ -157,7 +159,7 @@ func TestToNative(t *testing.T) {
 		{
 			convert: &converter{},
 			in:      sqltypes.TestValue(sqltypes.VarBinary, "a"),
-			out:     "a",
+			out:     []byte("a"),
 		},
 		{
 			convert: &converter{},
@@ -167,7 +169,7 @@ func TestToNative(t *testing.T) {
 		{
 			convert: &converter{},
 			in:      sqltypes.TestValue(sqltypes.Binary, "a"),
-			out:     "a",
+			out:     []byte("a"),
 		},
 		{
 			convert: &converter{},
@@ -193,11 +195,53 @@ func TestToNative(t *testing.T) {
 
 	for _, tcase := range testcases {
 		v, err := tcase.convert.ToNative(tcase.in)
-		if err != nil {
-			t.Error(err)
-		}
-		if !reflect.DeepEqual(v, tcase.out) {
-			t.Errorf("%v.ToNativeEx = %#v, want %#v", tcase.in, v, tcase.out)
-		}
+		require.NoError(t, err)
+		require.Equal(t, tcase.out, v)
+	}
+}
+
+func TestBuildBindVariable(t *testing.T) {
+	testcases := []struct {
+		name string
+		in   any
+		out  *querypb.BindVariable
+	}{
+		{
+			name: "json bytes become varchar",
+			in:   []byte("[]"),
+			out:  sqltypes.StringBindVariable("[]"),
+		},
+		{
+			name: "binary bytes become varchar",
+			in:   []byte{0x00, 0xff},
+			out: &querypb.BindVariable{
+				Type:  querypb.Type_VARCHAR,
+				Value: []byte{0x00, 0xff},
+			},
+		},
+		{
+			name: "nil bytes become null",
+			in:   []byte(nil),
+			out:  sqltypes.NullBindVariable,
+		},
+		{
+			name: "empty bytes become empty varchar",
+			in:   []byte{},
+			out:  sqltypes.StringBindVariable(""),
+		},
+		{
+			name: "time becomes datetime",
+			in:   time.Date(2012, 0o2, 24, 23, 19, 43, 0, time.UTC),
+			out:  sqltypes.ValueBindVariable(sqltypes.TestValue(sqltypes.Datetime, "2012-02-24 23:19:43")),
+		},
+	}
+
+	convert := &converter{location: time.UTC}
+	for _, tcase := range testcases {
+		t.Run(tcase.name, func(t *testing.T) {
+			bv, err := convert.BuildBindVariable(tcase.in)
+			require.NoError(t, err)
+			require.Equal(t, tcase.out, bv)
+		})
 	}
 }