Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ConvertJSONToInt unsigned bug (#11483) #11551

Merged
merged 4 commits into from
Aug 5, 2019
Merged

fix ConvertJSONToInt unsigned bug (#11483) #11551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225a8fb
fix StrToInt unsigned bug
H-ZeX Jul 28, 2019
1d8fc8a
change MustExec to MustQuery
H-ZeX Jul 29, 2019
1b808fc
Merge branch 'release-3.0' into release-3.0-1c0b366295fa
zz-jason Aug 3, 2019
0caf79e
Merge branch 'release-3.0' into release-3.0-1c0b366295fa
sre-bot Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,7 @@ func (s *testIntegrationSuite) TestBuiltin(c *C) {
result.Check(testkit.Rows("2017-01-01 00:00:00.00"))
result = tk.MustQuery(`select cast(20170118.999 as datetime);`)
result.Check(testkit.Rows("2017-01-18 00:00:00"))
tk.MustQuery(`select convert(a2.a, unsigned int) from (select cast('"9223372036854775808"' as json) as a) as a2;`)

tk.MustExec(`create table tb5(a bigint(64) unsigned, b double);`)
tk.MustExec(`insert into tb5 (a, b) values (9223372036854776000, 9223372036854776000);`)
Expand Down
6 changes: 5 additions & 1 deletion types/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,11 @@ func ConvertJSONToInt(sc *stmtctx.StatementContext, j json.BinaryJSON, unsigned
return int64(u), errors.Trace(err)
case json.TypeCodeString:
str := string(hack.String(j.GetString()))
return StrToInt(sc, str)
if !unsigned {
return StrToInt(sc, str)
}
u, err := StrToUint(sc, str)
return int64(u), errors.Trace(err)
}
return 0, errors.New("Unknown type code in JSON")
}
Expand Down
36 changes: 21 additions & 15 deletions types/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,22 +706,24 @@ func (s *testTypeConvertSuite) TestGetValidInt(c *C) {
tests := []struct {
origin string
valid string
signed bool
warning bool
}{
{"100", "100", false},
{"-100", "-100", false},
{"1abc", "1", true},
{"-1-1", "-1", true},
{"+1+1", "+1", true},
{"123..34", "123", true},
{"123.23E-10", "123", true},
{"1.1e1.3", "1", true},
{"11e1.3", "11", true},
{"1.", "1", true},
{".1", "0", true},
{"", "0", true},
{"123e+", "123", true},
{"123de", "123", true},
{"100", "100", true, false},
{"-100", "-100", true, false},
{"9223372036854775808", "9223372036854775808", false, false},
{"1abc", "1", true, true},
{"-1-1", "-1", true, true},
{"+1+1", "+1", true, true},
{"123..34", "123", true, true},
{"123.23E-10", "123", true, true},
{"1.1e1.3", "1", true, true},
{"11e1.3", "11", true, true},
{"1.", "1", true, true},
{".1", "0", true, true},
{"", "0", true, true},
{"123e+", "123", true, true},
{"123de", "123", true, true},
}
sc := new(stmtctx.StatementContext)
sc.TruncateAsWarning = true
Expand All @@ -731,7 +733,11 @@ func (s *testTypeConvertSuite) TestGetValidInt(c *C) {
prefix, err := getValidIntPrefix(sc, tt.origin)
c.Assert(err, IsNil)
c.Assert(prefix, Equals, tt.valid)
_, err = strconv.ParseInt(prefix, 10, 64)
if tt.signed {
_, err = strconv.ParseInt(prefix, 10, 64)
} else {
_, err = strconv.ParseUint(prefix, 10, 64)
}
c.Assert(err, IsNil)
warnings := sc.GetWarnings()
if tt.warning {
Expand Down