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

types: fix wrong str_to_date() microseconds with leading zeros are not converted correctly (#30122) #30220

Merged
merged 10 commits into from
Dec 20, 2021
Merged

types: fix wrong str_to_date() microseconds with leading zeros are not converted correctly (#30122) #30220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9575a84
cherry pick #30122 to release-5.0
wjhuang2016 Nov 29, 2021
e61e0f3
Update time.go
wjhuang2016 Dec 20, 2021
5e0824f
fix
wjhuang2016 Dec 20, 2021
fbcb46f
clean
wjhuang2016 Dec 20, 2021
10965ec
Merge branch 'release-5.0' into release-5.0-352811dfc4ee
ti-chi-bot Dec 20, 2021
45c9c11
Merge branch 'release-5.0' into release-5.0-352811dfc4ee
ti-chi-bot Dec 20, 2021
2674ea8
Merge branch 'release-5.0' into release-5.0-352811dfc4ee
ti-chi-bot Dec 20, 2021
5838461
Merge branch 'release-5.0' into release-5.0-352811dfc4ee
ti-chi-bot Dec 20, 2021
4fcb486
Merge branch 'release-5.0' into release-5.0-352811dfc4ee
ti-chi-bot Dec 20, 2021
c6be99b
Merge branch 'release-5.0' into release-5.0-352811dfc4ee
ti-chi-bot Dec 20, 2021
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/builtin_time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,7 @@ func (s *testEvaluatorSuite) TestStrToDate(c *C) {
{"15-01-2001 1:59:58.", "%d-%m-%Y %H:%i:%s.%f", true, types.KindMysqlTime, time.Date(2001, 1, 15, 1, 59, 58, 000000000, time.Local)},
{"15-01-2001 1:9:8.999", "%d-%m-%Y %H:%i:%s.%f", true, types.KindMysqlTime, time.Date(2001, 1, 15, 1, 9, 8, 999000000, time.Local)},
{"15-01-2001 1:9:8.999", "%d-%m-%Y %H:%i:%S.%f", true, types.KindMysqlTime, time.Date(2001, 1, 15, 1, 9, 8, 999000000, time.Local)},
{"2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f", true, types.KindMysqlTime, time.Date(2003, 1, 2, 10, 11, 12, 1200000, time.Local)},
{"2003-01-02 10:11:12 PM", "%Y-%m-%d %H:%i:%S %p", false, types.KindMysqlTime, time.Time{}},
{"10:20:10AM", "%H:%i:%S%p", false, types.KindMysqlTime, time.Time{}},
// test %@(skip alpha), %#(skip number), %.(skip punct)
Expand Down
2 changes: 1 addition & 1 deletion types/time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3225,7 +3225,7 @@ func microSeconds(t *CoreTime, input string, ctx map[string]int) (string, bool)
if !ok {
return input, false
}
for v > 0 && v*10 < 1000000 {
for i := length; i < 6; i++ {
v *= 10
}
t.setMicrosecond(uint32(v))
Expand Down