From e797eca206f41bd785ae2cd8e1ffb16a22347b66 Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 26 Oct 2022 12:16:08 -0700 Subject: [PATCH] removing all unsigned --- .../doltcore/env/actions/infer_schema.go | 2 ++ .../doltcore/env/actions/infer_schema_test.go | 29 ++++--------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/go/libraries/doltcore/env/actions/infer_schema.go b/go/libraries/doltcore/env/actions/infer_schema.go index fabd2a4721..74578ae5b9 100644 --- a/go/libraries/doltcore/env/actions/infer_schema.go +++ b/go/libraries/doltcore/env/actions/infer_schema.go @@ -218,10 +218,12 @@ func leastPermissiveNumericType(strVal string, floatThreshold float64) (ti typei // always parse as signed int i, err := strconv.ParseInt(strVal, 10, 64) + // use string for out of range if errors.Is(err, strconv.ErrRange) { return typeinfo.StringDefaultType } + if err != nil { return typeinfo.UnknownType } diff --git a/go/libraries/doltcore/env/actions/infer_schema_test.go b/go/libraries/doltcore/env/actions/infer_schema_test.go index 40bdedb68a..803bf3e60e 100644 --- a/go/libraries/doltcore/env/actions/infer_schema_test.go +++ b/go/libraries/doltcore/env/actions/infer_schema_test.go @@ -142,14 +142,6 @@ func testFindCommonType(t *testing.T) { }, expType: typeinfo.Int64Type, }, - { - name: "all unsigned ints", - inferSet: typeInfoSet{ - typeinfo.Uint32Type: {}, - typeinfo.Uint64Type: {}, - }, - expType: typeinfo.Uint64Type, - }, { name: "all floats", inferSet: typeInfoSet{ @@ -159,35 +151,31 @@ func testFindCommonType(t *testing.T) { expType: typeinfo.Float64Type, }, { - name: "32 bit ints and uints", + name: "32 bit ints", inferSet: typeInfoSet{ - typeinfo.Int32Type: {}, - typeinfo.Uint32Type: {}, + typeinfo.Int32Type: {}, }, expType: typeinfo.Int32Type, }, { - name: "64 bit ints and uints", + name: "64 bit ints", inferSet: typeInfoSet{ - typeinfo.Int64Type: {}, - typeinfo.Uint64Type: {}, + typeinfo.Int64Type: {}, }, expType: typeinfo.Int64Type, }, { - name: "32 bit ints, uints, and floats", + name: "32 bit ints and floats", inferSet: typeInfoSet{ typeinfo.Int32Type: {}, - typeinfo.Uint32Type: {}, typeinfo.Float32Type: {}, }, expType: typeinfo.Float32Type, }, { - name: "64 bit ints, uints, and floats", + name: "64 bit ints and floats", inferSet: typeInfoSet{ typeinfo.Int64Type: {}, - typeinfo.Uint64Type: {}, typeinfo.Float64Type: {}, }, expType: typeinfo.Float64Type, @@ -228,11 +216,6 @@ func testFindCommonType(t *testing.T) { func testFindCommonTypeFromSingleType(t *testing.T) { allTypes := []typeinfo.TypeInfo{ - typeinfo.Uint8Type, - typeinfo.Uint16Type, - typeinfo.Uint24Type, - typeinfo.Uint32Type, - typeinfo.Uint64Type, typeinfo.Int8Type, typeinfo.Int16Type, typeinfo.Int24Type,