revert and try make

Author: James Cor

sql/types/decimal.go

@@ -303,8 +303,7 @@ func (t DecimalType_) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltype
 	if err != nil {
 		return sqltypes.Value{}, err
 	}
-	//val := AppendAndSliceString(dest, t.DecimalValueStringFixed(value.Decimal))
-	val := []byte(t.DecimalValueStringFixed(value.Decimal))
+	val := AppendAndSliceString(dest, t.DecimalValueStringFixed(value.Decimal))
 	return sqltypes.MakeTrusted(sqltypes.Decimal, val), nil
 }
 

sql/types/json.go

@@ -154,8 +154,7 @@ func (t JsonType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Va
 		if err != nil {
 			return sqltypes.NULL, err
 		}
-		//val = AppendAndSliceString(dest, str)
-		val = []byte(str)
+		val = AppendAndSliceString(dest, str)
 	}
 
 	return sqltypes.MakeTrusted(sqltypes.TypeJSON, val), nil

sql/types/strings.go

@@ -480,7 +480,7 @@ func ConvertToBytes(ctx context.Context, v interface{}, t sql.StringType, dest [
 				val = append(dest, b...)
 				start = len(dest)
 			}
-			val = append(val, bytes.Repeat([]byte{0}, int(st.maxCharLength)-len(val))...)
+			val = append(val, make([]byte, int(st.maxCharLength)-len(val))...)
 		}
 	}
 	val = val[start:]
@@ -715,10 +715,13 @@ func (t StringType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.
 		var valueBytes []byte
 		switch v := v.(type) {
 		case JSONBytes:
-			valueBytes, err = v.GetBytes(ctx)
+			// TODO: put on dest?
+			val, err = v.GetBytes(ctx)
 			if err != nil {
 				return sqltypes.Value{}, err
 			}
+			dest = append(dest, val...)
+			valueBytes = dest[start:]
 		case []byte:
 			valueBytes = v
 		case string:
@@ -893,10 +896,3 @@ func AppendAndSliceString(buffer []byte, addition string) (slice []byte) {
 	slice = buffer[stop:]
 	return
 }
-
-func AppendAndSliceBytes(buffer, addition []byte) (slice []byte) {
-	stop := len(buffer)
-	buffer = append(buffer, addition...)
-	slice = buffer[stop:]
-	return
-}

sql/types/system_enum.go

@@ -157,8 +157,7 @@ func (t systemEnumType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqlty
 		return sqltypes.Value{}, err
 	}
 
-	//val := AppendAndSliceString(dest, v.(string))
-	val := []byte(v.(string))
+	val := AppendAndSliceString(dest, v.(string))
 
 	return sqltypes.MakeTrusted(t.Type(), val), nil
 }

sql/types/system_set.go

@@ -143,8 +143,7 @@ func (t systemSetType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltyp
 		return sqltypes.Value{}, err
 	}
 
-	//val := AppendAndSliceString(dest, value)
-	val := []byte(value)
+	val := AppendAndSliceString(dest, value)
 
 	return sqltypes.MakeTrusted(t.Type(), val), nil
 }

sql/types/system_string.go

@@ -102,8 +102,7 @@ func (t systemStringType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sql
 		return sqltypes.Value{}, err
 	}
 
-	//val := AppendAndSliceString(dest, v.(string))
-	val := []byte(v.(string))
+	val := AppendAndSliceString(dest, v.(string))
 
 	return sqltypes.MakeTrusted(t.Type(), val), nil
 }