Merge pull request #6864 from bdarnell/parse-numeric

sql: Parse "e" case-insensitively in numeric constants

sql/parser/constant.go

@@ -234,7 +234,7 @@ func (expr *NumVal) ResolveAsType(typ Datum) (Datum, error) {
 			// TODO(nvanbenschoten) Handling e will not be necessary once the TODO about the
 			// OrigString workaround from above is addressed.
 			eScale := inf.Scale(0)
-			if eIdx := strings.IndexRune(s, 'e'); eIdx != -1 {
+			if eIdx := strings.IndexAny(s, "eE"); eIdx != -1 {
 				eInt, err := strconv.ParseInt(s[eIdx+1:], 10, 32)
 				if err != nil {
 					return nil, fmt.Errorf("could not evaluate %v as Datum type DDecimal from "+

sql/parser/constant_test.go

@@ -65,7 +65,7 @@ func TestNumericConstantAvailableTypes(t *testing.T) {
 		}
 
 		// Check available types.
-		c := &NumVal{Value: val}
+		c := &NumVal{Value: val, OrigString: test.str}
 		avail := c.AvailableTypes()
 		if !reflect.DeepEqual(avail, test.avail) {
 			t.Errorf("%d: expected the available type set %v for %v, found %v",