added collations

Author: James Cor

sql/types/datetime.go

@@ -481,7 +481,7 @@ func (t datetimeType) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sq
 	}
 	switch t.baseType {
 	case sqltypes.Date:
-		// TODO: move this to values
+		// TODO: move this to values package
 		x := values.ReadUint32(v.Val)
 		y := x >> 16
 		m := (x & (255 << 8)) >> 8

sql/types/enum.go

@@ -17,6 +17,7 @@ package types
 import (
 	"context"
 	"fmt"
+	"github.com/dolthub/go-mysql-server/sql/values"
 	"reflect"
 	"strconv"
 	"strings"
@@ -268,6 +269,33 @@ func (t EnumType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Va
 	return sqltypes.MakeTrusted(sqltypes.Enum, val), nil
 }
 
+func (t EnumType) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
+	if v.IsNull() {
+		return sqltypes.NULL, nil
+	}
+
+	idx := values.ReadUint16(v.Val)
+	value, _ := t.At(int(idx))
+
+	charset := ctx.GetCharacterSetResults()
+	if charset == sql.CharacterSet_Unspecified || charset == sql.CharacterSet_binary {
+		charset = t.collation.CharacterSet()
+	}
+
+	// TODO: write append style encoder
+	res, ok := charset.Encoder().Encode(encodings.StringToBytes(value)) // TODO: use unsafe string to byte
+	if !ok {
+		// return snippet of the converted value
+		if len(value) > 50 {
+			value = value[:50]
+		}
+		value = strings.ToValidUTF8(value, string(utf8.RuneError))
+		return sqltypes.Value{}, sql.ErrCharSetFailedToEncode.New(charset.Name(), utf8.ValidString(value), value)
+	}
+
+	return sqltypes.MakeTrusted(sqltypes.Enum, res), nil
+}
+
 // String implements Type interface.
 func (t EnumType) String() string {
 	return t.StringWithTableCollation(sql.Collation_Default)

sql/types/set.go

@@ -17,6 +17,7 @@ package types
 import (
 	"context"
 	"fmt"
+	"github.com/dolthub/go-mysql-server/sql/values"
 	"math"
 	"math/bits"
 	"reflect"
@@ -261,6 +262,35 @@ func (t SetType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Val
 	return sqltypes.MakeTrusted(sqltypes.Set, val), nil
 }
 
+func (t SetType) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
+	if v.IsNull() {
+		return sqltypes.NULL, nil
+	}
+
+	bits := values.ReadUint64(v.Val)
+	value, err := t.BitsToString(bits)
+	if err != nil {
+		return sqltypes.Value{}, err
+	}
+
+	resultCharset := ctx.GetCharacterSetResults()
+	if resultCharset == sql.CharacterSet_Unspecified || resultCharset == sql.CharacterSet_binary {
+		resultCharset = t.collation.CharacterSet()
+	}
+
+	// TODO: write append style encoder
+	res, ok := resultCharset.Encoder().Encode(encodings.StringToBytes(value)) // TODO: use unsafe string to byte
+	if !ok {
+		if len(value) > 50 {
+			value = value[:50]
+		}
+		value = strings.ToValidUTF8(value, string(utf8.RuneError))
+		return sqltypes.Value{}, sql.ErrCharSetFailedToEncode.New(resultCharset.Name(), utf8.ValidString(value), value)
+	}
+
+	return sqltypes.MakeTrusted(sqltypes.Set, res), nil
+}
+
 // String implements Type interface.
 func (t SetType) String() string {
 	return t.StringWithTableCollation(sql.Collation_Default)

sql/types/strings.go

@@ -796,7 +796,6 @@ func (t StringType) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqlt
 		return sqltypes.NULL, nil
 	}
 
-	// TODO: collations
 	// TODO: deal with casting numbers?
 	// No need to use dest buffer as we have already allocated []byte
 	var err error
@@ -806,8 +805,20 @@ func (t StringType) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqlt
 			return sqltypes.Value{}, err
 		}
 	}
+	charset := ctx.GetCharacterSetResults()
+	if charset == sql.CharacterSet_Unspecified || charset == sql.CharacterSet_binary {
+		charset = t.collation.CharacterSet()
+	}
+	res, ok := charset.Encoder().Encode(v.Val)
+	if !ok {
+		if len(v.Val) > 50 {
+			v.Val = v.Val[:50]
+		}
+		snippetStr := strings2.ToValidUTF8(string(v.Val), string(utf8.RuneError))
+		return sqltypes.Value{}, sql.ErrCharSetFailedToEncode.New(charset.Name(), utf8.ValidString(snippetStr), v.Val)
+	}
 
-	return sqltypes.MakeTrusted(t.baseType, v.Val), nil
+	return sqltypes.MakeTrusted(t.baseType, res), nil
 }
 
 // String implements Type interface.