rm extra changes

Author: elianddb

sql/expression/enum.go

@@ -80,7 +80,7 @@ func (e *EnumToString) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	case string:
 		str = v
 	default:
-		return nil, sql.ErrInvalidType.New(types.Text.String())
+		return nil, sql.ErrInvalidType.New(val, types.Text)
 	}
 	return str, nil
 }

sql/types/enum.go

@@ -165,13 +165,13 @@ func (t EnumType) Convert(ctx context.Context, v interface{}) (interface{}, sql.
 
 	switch value := v.(type) {
 	case int:
-		if _, ok := t.At(value); ok {
-			return uint16(value), sql.InRange, nil
-		}
 		// MySQL rejects 0 values in strict mode regardless of enum definition
 		if value == 0 && t.validateScrictMode(ctx) {
 			return nil, sql.OutOfRange, ErrConvertingToEnum.New(value)
 		}
+		if _, ok := t.At(value); ok {
+			return uint16(value), sql.InRange, nil
+		}
 	case uint:
 		return t.Convert(ctx, int(value))
 	case int8:
@@ -224,7 +224,6 @@ func (t EnumType) validateScrictMode(ctx context.Context) bool {
 	return false
 }
 
-
 // Equals implements the Type interface.
 func (t EnumType) Equals(otherType sql.Type) bool {
 	if ot, ok := otherType.(EnumType); ok && t.collation.Equals(ot.collation) && len(t.idxToVal) == len(ot.idxToVal) {