consolidate logic for truncation

Author: James Cor

sql/expression/in.go

@@ -107,11 +107,11 @@ func (in *InTuple) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			if types.IsDecimal(elType) || types.IsFloat(elType) {
 				rtyp := el.Type().Promote()
 				left, _, err := rtyp.Convert(ctx, left)
-				if err != nil {
+				if err != nil && !sql.ErrTruncatedIncorrect.Is(err) {
 					return nil, err
 				}
 				right, _, err := rtyp.Convert(ctx, originalRight)
-				if err != nil {
+				if err != nil && !sql.ErrTruncatedIncorrect.Is(err) {
 					return nil, err
 				}
 				cmp, err = rtyp.Compare(ctx, left, right)
@@ -120,7 +120,7 @@ func (in *InTuple) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 				}
 			} else {
 				right, _, err := typ.Convert(ctx, originalRight)
-				if err != nil {
+				if err != nil && !sql.ErrTruncatedIncorrect.Is(err) {
 					return nil, err
 				}
 				cmp, err = typ.Compare(ctx, left, right)

sql/hash/hash.go

@@ -142,7 +142,8 @@ func HashOfSimple(ctx *sql.Context, i interface{}, t sql.Type) (uint64, error) {
 		}
 	} else {
 		x, _, err := t.Promote().Convert(ctx, i)
-		if err != nil {
+		// TODO: throw warning?
+		if err != nil && !sql.ErrTruncatedIncorrect.Is(err) {
 			return 0, err
 		}
 

sql/types/conversion.go

@@ -823,14 +823,9 @@ func ConvertHexBlobToUint(val interface{}, originType sql.Type) (interface{}, er
 	return val, nil
 }
 
-// TruncateStringToNumber truncates a string to the appropriate number prefix
+// TruncateStringToNumber truncates a string to the appropriate number prefix.
+// This function expects whitespace to already be properly trimmed.
 func TruncateStringToNumber(s string, isInt bool) string {
-	if isInt {
-		s = strings.TrimLeft(s, IntCutSet)
-	} else {
-		s = strings.TrimLeft(s, NumericCutSet)
-	}
-
 	seenDigit := false
 	seenDot := false
 	seenExp := false

sql/types/decimal.go

@@ -23,6 +23,7 @@ import (
 	"gopkg.in/src-d/go-errors.v1"
 	"math/big"
 	"reflect"
+	"strings"
 
 	"github.com/dolthub/go-mysql-server/sql"
 )
@@ -199,7 +200,7 @@ func (t DecimalType_) ConvertToNullDecimal(v interface{}) (decimal.NullDecimal,
 	case float64:
 		return t.ConvertToNullDecimal(decimal.NewFromFloat(value))
 	case string:
-		// TODO: implement truncation here
+		value = strings.Trim(value, NumericCutSet)
 		if len(value) == 0 {
 			return t.ConvertToNullDecimal(decimal.NewFromInt(0))
 		}
@@ -213,7 +214,7 @@ func (t DecimalType_) ConvertToNullDecimal(v interface{}) (decimal.NullDecimal,
 			}
 		}
 
-		// TODO: how do we know that it is a hex number and not string?
+		// TODO: hex strings should not make it this far as numbers
 		value = TruncateStringToNumber(value, false)
 		if len(value) == 0 {
 			return t.ConvertToNullDecimal(decimal.NewFromInt(0))

sql/types/number.go

@@ -22,6 +22,7 @@ import (
 	"reflect"
 	"regexp"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/dolthub/vitess/go/sqltypes"
@@ -990,7 +991,7 @@ func convertToInt64(t NumberTypeImpl_, v interface{}) (int64, sql.ConvertInRange
 		}
 		return i, sql.InRange, nil
 	case string:
-
+		v = strings.Trim(v, IntCutSet)
 		if len(v) == 0 {
 			// StringType{}.Zero() returns empty string, but should represent "0" for number value
 			return 0, sql.InRange, nil
@@ -1001,18 +1002,18 @@ func convertToInt64(t NumberTypeImpl_, v interface{}) (int64, sql.ConvertInRange
 		}
 		// If that fails, try as a float and round to integral
 		if f, err := strconv.ParseFloat(v, 64); err == nil {
-			f = math.Round(f)
+			f = math.Round(f) // TODO: inserting rounds up, while casting truncates
 			return int64(f), sql.InRange, nil
 		}
 		// If that fails, truncate the string and parse as int
-		// TODO: throw error / warning?
 		v = TruncateStringToNumber(v, true)
 		if len(v) == 0 {
-			return 0, sql.InRange, nil
+			return 0, sql.InRange, sql.ErrTruncatedIncorrect.New(t.String(), v)
 		}
 		if i, err := strconv.ParseInt(v, 10, 64); err == nil {
-			return i, sql.InRange, nil
+			return i, sql.InRange, sql.ErrTruncatedIncorrect.New(t.String(), v)
 		}
+		// TODO: what should this error be?
 		return 0, sql.OutOfRange, sql.ErrInvalidValue.New(v, t.String())
 	case bool:
 		if v {
@@ -1547,14 +1548,15 @@ func convertToFloat64(t NumberTypeImpl_, v interface{}) (float64, error) {
 		}
 		return float64(i), nil
 	case string:
-		i, err := strconv.ParseFloat(v, 64)
-		if err != nil {
-			// parse the first longest valid numbers
-			s := numre.FindString(v)
-			i, _ = strconv.ParseFloat(s, 64)
-			return i, sql.ErrTruncatedIncorrect.New(t.String(), v)
-		}
-		return i, nil
+		v = strings.Trim(v, NumericCutSet)
+		if i, err := strconv.ParseFloat(v, 64); err == nil {
+			return i, nil
+		}
+		// TODO: what's the difference between this and TruncateStringToNumber?
+		// parse the first longest valid numbers
+		s := numre.FindString(v)
+		i, _ := strconv.ParseFloat(s, 64)
+		return i, sql.ErrTruncatedIncorrect.New(t.String(), v)
 	case bool:
 		if v {
 			return 1, nil