refactor

Author: James Cor

sql/errors.go

@@ -948,9 +948,8 @@ var (
 
 	ErrEnumTypeTruncated = errors.NewKind("new enum type change truncates value")
 
-	// ErrDoubleTypeTruncated is thrown when trying to convert a bad value to a double
-	// TODO: MySQL's exact error message is "Data truncated for column '%s' at row %d"
-	ErrDoubleTypeTruncated = errors.NewKind("data truncated for '%v'")
+	// ErrTruncatedIncorrect is thrown when converting a value results in portions of the data to be trimmed.
+	ErrTruncatedIncorrect = errors.NewKind("Truncated incorrect %s value: %v")
 )
 
 // CastSQLError returns a *mysql.SQLError with the error code and in some cases, also a SQL state, populated for the

sql/expression/convert.go

@@ -366,14 +366,13 @@ func convertValue(ctx *sql.Context, val interface{}, castTo string, originType s
 		}
 		return d, nil
 	case ConvertToDouble, ConvertToReal:
-		//value, err := prepareForNumericContext(val, originType, false)
-		value, err := types.ConvertOrTruncate(ctx, val, originType)
+		value, err := prepareForNumericContext(val, originType, false)
 		if err != nil {
 			return nil, err
 		}
 		d, _, err := types.Float64.Convert(ctx, value)
 		if err != nil {
-			if sql.ErrDoubleTypeTruncated.Is(err) {
+			if sql.ErrTruncatedIncorrect.Is(err) {
 				ctx.Warn(1265, "%s", err.Error())
 				return d, nil
 			}

sql/plan/hash_lookup.go

@@ -170,7 +170,7 @@ func (n *HashLookup) GetHashKey(ctx *sql.Context, e sql.Expression, row sql.Row)
 		// The LHS expression was NullType. This is allowed.
 		return nil, nil
 	}
-	if err != nil && !sql.ErrDoubleTypeTruncated.Is(err) {
+	if err != nil && !sql.ErrTruncatedIncorrect.Is(err) {
 		// Truncated warning is already thrown elsewhere.
 		return nil, err
 	}

sql/types/conversion.go

@@ -768,11 +768,6 @@ func TypeAwareConversion(ctx *sql.Context, val interface{}, originalType sql.Typ
 // value is truncated to the Zero value for type |t|. If the value does not convert and the type is not automatically
 // coerced, then return an error.
 func ConvertOrTruncate(ctx *sql.Context, i interface{}, t sql.Type) (interface{}, error) {
-	// Do nothing if type is no provided.
-	if t == nil {
-		return i, nil
-	}
-
 	converted, _, err := t.Convert(ctx, i)
 	if err == nil {
 		return converted, nil

sql/types/number.go

@@ -530,7 +530,7 @@ func (t NumberTypeImpl_) SQLUint64(ctx *sql.Context, dest []byte, v interface{})
 
 func (t NumberTypeImpl_) SQLFloat64(ctx *sql.Context, dest []byte, v interface{}) ([]byte, error) {
 	num, err := convertToFloat64(t, v)
-	if err != nil && !sql.ErrDoubleTypeTruncated.Is(err) {
+	if err != nil && !sql.ErrTruncatedIncorrect.Is(err) {
 		return nil, err
 	}
 	dest = strconv.AppendFloat(dest, num, 'g', -1, 64)
@@ -1544,7 +1544,7 @@ func convertToFloat64(t NumberTypeImpl_, v interface{}) (float64, error) {
 			// parse the first longest valid numbers
 			s := numre.FindString(v)
 			i, _ = strconv.ParseFloat(s, 64)
-			return i, sql.ErrDoubleTypeTruncated.New(v)
+			return i, sql.ErrTruncatedIncorrect.New(t.String(), v)
 		}
 		return i, nil
 	case bool: