database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Lonng <heng@lonng.org>
This commit is contained in:
Lonng
2019-10-15 17:51:25 +08:00
committed by GitHub
parent 15984f696d
commit e80bab6d46
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
executor/executor_test.go
View File

@ -3997,6 +3997,9 @@ func (s *testSuite4) TearDownTest(c *C) {
func (s *testSuiteP1) 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"))

1
expression/builtin_time.go
View File

@ -1788,6 +1788,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

18
types/time.go
View File

@ -2199,6 +2199,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
@ -2316,21 +2321,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
}