add miss unwraps

Author: elianddb

sql/expression/function/concat_ws.go

@@ -127,6 +127,12 @@ func (f *ConcatWithSeparator) Eval(ctx *sql.Context, row sql.Row) (interface{},
 			return nil, err
 		}
 
+		// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+		val, err = sql.UnwrapAny(ctx, val)
+		if err != nil {
+			return nil, err
+		}
+
 		parts = append(parts, val.(string))
 	}
 

sql/expression/function/export_set.go

@@ -171,6 +171,13 @@ func (e *ExportSet) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
+
+		// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+		sepStr, err = sql.UnwrapAny(ctx, sepStr)
+		if err != nil {
+			return nil, err
+		}
+
 		separatorVal = sepStr.(string)
 	}
 
@@ -206,11 +213,23 @@ func (e *ExportSet) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	onStr, err = sql.UnwrapAny(ctx, onStr)
+	if err != nil {
+		return nil, err
+	}
+
 	offStr, _, err := types.LongText.Convert(ctx, offVal)
 	if err != nil {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	offStr, err = sql.UnwrapAny(ctx, offStr)
+	if err != nil {
+		return nil, err
+	}
+
 	bits := bitsInt.(uint64)
 	on := onStr.(string)
 	off := offStr.(string)

sql/expression/function/insert.go

@@ -127,6 +127,12 @@ func (i *Insert) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	strVal, err = sql.UnwrapAny(ctx, strVal)
+	if err != nil {
+		return nil, err
+	}
+
 	posVal, _, err := types.Int64.Convert(ctx, pos)
 	if err != nil {
 		return nil, err
@@ -142,6 +148,12 @@ func (i *Insert) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	newStrVal, err = sql.UnwrapAny(ctx, newStrVal)
+	if err != nil {
+		return nil, err
+	}
+
 	s := strVal.(string)
 	p := posVal.(int64)
 	l := lengthVal.(int64)

sql/expression/function/locate.go

@@ -109,6 +109,12 @@ func (l *Locate) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	substrVal, err = sql.UnwrapAny(ctx, substrVal)
+	if err != nil {
+		return nil, err
+	}
+
 	substr, ok := substrVal.(string)
 	if !ok {
 		return nil, sql.ErrInvalidArgumentDetails.New("locate", "substring must be a string")
@@ -128,6 +134,12 @@ func (l *Locate) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	strVal, err = sql.UnwrapAny(ctx, strVal)
+	if err != nil {
+		return nil, err
+	}
+
 	str, ok := strVal.(string)
 	if !ok {
 		return nil, sql.ErrInvalidArgumentDetails.New("locate", "string must be a string")

sql/expression/function/make_set.go

@@ -143,6 +143,13 @@ func (m *MakeSet) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 				if err != nil {
 					return nil, err
 				}
+
+				// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+				valStr, err = sql.UnwrapAny(ctx, valStr)
+				if err != nil {
+					return nil, err
+				}
+
 				result = append(result, valStr.(string))
 			}
 		}

sql/expression/function/soundex.go

@@ -66,6 +66,12 @@ func (s *Soundex) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	v, err = sql.UnwrapAny(ctx, v)
+	if err != nil {
+		return nil, err
+	}
+
 	var b strings.Builder
 	var last rune
 	for _, c := range strings.ToUpper(v.(string)) {

sql/expression/function/substring.go

@@ -234,6 +234,13 @@ func (s *SubstringIndex) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 	if err != nil {
 		return nil, err
 	}
+
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	ex, err = sql.UnwrapAny(ctx, ex)
+	if err != nil {
+		return nil, err
+	}
+
 	str, ok := ex.(string)
 	if !ok {
 		return nil, sql.ErrInvalidType.New(reflect.TypeOf(ex).String())
@@ -247,6 +254,13 @@ func (s *SubstringIndex) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 	if err != nil {
 		return nil, err
 	}
+
+	// Handle Dolt's TextStorage wrapper that doesn't convert to plain string
+	ex, err = sql.UnwrapAny(ctx, ex)
+	if err != nil {
+		return nil, err
+	}
+
 	delim, ok := ex.(string)
 	if !ok {
 		return nil, sql.ErrInvalidType.New(reflect.TypeOf(ex).String())