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

types: fix STR_TO_DATE handling for %h, %r (#18171) (#18428) #18727

Merged
merged 3 commits into from
Jul 28, 2020
Merged

types: fix STR_TO_DATE handling for %h, %r (#18171) (#18428) #18727

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ac3162
cherry pick #18428 to release-4.0
dyzsr Jul 22, 2020
1240597
Merge branch 'release-4.0' into release-4.0-cc0b6f1aec1a
ti-srebot Jul 28, 2020
c880af9
Merge branch 'release-4.0' into release-4.0-cc0b6f1aec1a
ti-srebot Jul 28, 2020
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
13 changes: 7 additions & 6 deletions types/format_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ func (s *testTimeSuite) TestStrToDate(c *C) {
{`May 01, 2013`, `%M %d,%Y`, types.FromDate(2013, 5, 1, 0, 0, 0, 0)},
{`a09:30:17`, `a%h:%i:%s`, types.FromDate(0, 0, 0, 9, 30, 17, 0)},
{`09:30:17a`, `%h:%i:%s`, types.FromDate(0, 0, 0, 9, 30, 17, 0)},
{`12:43:24`, `%h:%i:%s`, types.FromDate(0, 0, 0, 0, 43, 24, 0)},
{`abc`, `abc`, types.ZeroCoreTime},
{`09`, `%m`, types.FromDate(0, 9, 0, 0, 0, 0, 0)},
{`09`, `%s`, types.FromDate(0, 0, 0, 0, 0, 9, 0)},
{`12:43:24 AM`, `%r`, types.FromDate(0, 0, 0, 12, 43, 24, 0)},
{`12:43:24 AM`, `%r`, types.FromDate(0, 0, 0, 0, 43, 24, 0)},
{`12:43:24 PM`, `%r`, types.FromDate(0, 0, 0, 12, 43, 24, 0)},
{`11:43:24 PM`, `%r`, types.FromDate(0, 0, 0, 23, 43, 24, 0)},
{`00:12:13`, `%T`, types.FromDate(0, 0, 0, 0, 12, 13, 0)},
{`23:59:59`, `%T`, types.FromDate(0, 0, 0, 23, 59, 59, 0)},
Expand Down Expand Up @@ -129,18 +131,17 @@ func (s *testTimeSuite) TestStrToDate(c *C) {
}{
{`04/31/2004`, `%m/%d/%Y`},
{`a09:30:17`, `%h:%i:%s`}, // format mismatch
{`12:43:24 PM`, `%r`},
{`12:43:24`, `%r`}, // no PM or AM followed
{`23:60:12`, `%T`}, // invalid minute
{`12:43:24`, `%r`}, // no PM or AM followed
{`23:60:12`, `%T`}, // invalid minute
{`18`, `%l`},
{`00:21:22 AM`, `%h:%i:%s %p`},
{`100/10/22`, `%y/%m/%d`},
{"2010-11-12 11 am", `%Y-%m-%d %H %p`},
{"2010-11-12 13 am", `%Y-%m-%d %h %p`},
{"2010-11-12 0 am", `%Y-%m-%d %h %p`},
}
for _, tt := range errTests {
for i, tt := range errTests {
var t types.Time
c.Assert(t.StrToDate(sc, tt.input, tt.format), IsFalse)
c.Assert(t.StrToDate(sc, tt.input, tt.format), IsFalse, Commentf("no.%d failed", i))
}
}
9 changes: 9 additions & 0 deletions types/time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,6 +2498,10 @@ func mysqlTimeFix(t *CoreTime, ctx map[string]int) error {
if valueAMorPm == constForPM {
t.setHour(t.getHour() + 12)
}
} else {
if _, ok := ctx["%h"]; ok && t.Hour() == 12 {
t.setHour(0)
}
}
return nil
}
Expand Down Expand Up @@ -2703,6 +2707,10 @@ func time12Hour(t *CoreTime, input string, ctx map[string]int) (string, bool) {
if !succ || hour > 12 || hour == 0 || input[2] != ':' {
return input, false
}
// 12:34:56 AM -> 00:34:56
if hour == 12 {
hour = 0
}

minute, succ := parseDigits(input[3:], 2)
if !succ || minute > 59 || input[5] != ':' {
Expand Down Expand Up @@ -2826,6 +2834,7 @@ func hour12Numeric(t *CoreTime, input string, ctx map[string]int) (string, bool)
return input, false
}
t.setHour(uint8(v))
ctx["%h"] = v
return input[length:], true
}

Expand Down