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 the STR_TO_DATE incompatible between MySQL and TiDB (#12623) #12725

Merged
merged 3 commits into from
Oct 16, 2019
Merged

fix the STR_TO_DATE incompatible between MySQL and TiDB (#12623) #12725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abb0f5d
fix the STR_TO_DATE incompitable in MySQL and TiDB
lonng Oct 15, 2019
cd07e2f
coverage some test
lonng Oct 15, 2019
bcbb0ba
fix CI failure
lonng Oct 15, 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
3 changes: 3 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3796,6 +3796,9 @@ func (s *testSuite4) TearDownTest(c *C) {

func (s *testSuite) TestStrToDateBuiltin(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustQuery(`select str_to_date('20190101','%Y%m%d%!') from dual`).Check(testkit.Rows("2019-01-01"))
tk.MustQuery(`select str_to_date('20190101','%Y%m%d%f') from dual`).Check(testkit.Rows("2019-01-01 00:00:00.000000"))
tk.MustQuery(`select str_to_date('20190101','%Y%m%d%H%i%s') from dual`).Check(testkit.Rows("2019-01-01 00:00:00"))
tk.MustQuery(`select str_to_date('18/10/22','%y/%m/%d') from dual`).Check(testkit.Rows("2018-10-22"))
tk.MustQuery(`select str_to_date('a18/10/22','%y/%m/%d') from dual`).Check(testkit.Rows("<nil>"))
tk.MustQuery(`select str_to_date('69/10/22','%y/%m/%d') from dual`).Check(testkit.Rows("2069-10-22"))
Expand Down
1 change: 1 addition & 0 deletions expression/builtin_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,7 @@ func (c *strToDateFunctionClass) getRetTp(ctx sessionctx.Context, arg Expression
if err != nil || isNull {
return
}

isDuration, isDate := types.GetFormatType(format)
if isDuration && !isDate {
tp = mysql.TypeDuration
Expand Down
18 changes: 8 additions & 10 deletions types/time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2179,6 +2179,11 @@ func strToDate(t *MysqlTime, date string, format string, ctx map[string]int) boo
return true
}

if len(date) == 0 {
ctx[token] = 0
return true
}

dateRemain, succ := matchDateWithToken(t, date, token, ctx)
if !succ {
return false
Expand Down Expand Up @@ -2296,21 +2301,14 @@ func GetFormatType(format string) (isDuration, isDate bool) {
isDuration, isDate = false, false
break
}
var durationTokens bool
var dateTokens bool
if len(token) >= 2 && token[0] == '%' {
switch token[1] {
case 'h', 'H', 'i', 'I', 's', 'S', 'k', 'l':
durationTokens = true
case 'h', 'H', 'i', 'I', 's', 'S', 'k', 'l', 'f':
isDuration = true
case 'y', 'Y', 'm', 'M', 'c', 'b', 'D', 'd', 'e':
dateTokens = true
isDate = true
}
}
if durationTokens {
isDuration = true
} else if dateTokens {
isDate = true
}
if isDuration && isDate {
break
}
Expand Down