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: handle io.EOF error when to parse datatime #39405

Merged
merged 9 commits into from
Nov 28, 2022
Merged

types: handle io.EOF error when to parse datatime #39405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1140240
types: handle io.EOF error when to parse datatime
hawkingrei Nov 27, 2022
884d33a
types: handle io.EOF error when to parse datatime
hawkingrei Nov 27, 2022
5c91a19
types: handle io.EOF error when to parse datatime
hawkingrei Nov 27, 2022
c043997
Merge branch 'master' into fix_eof
hawkingrei Nov 28, 2022
a0d7014
Merge branch 'master' into fix_eof
hawkingrei Nov 28, 2022
a4abb67
Merge branch 'master' into fix_eof
hawkingrei Nov 28, 2022
1ac7ab8
update linter
hawkingrei Nov 28, 2022
a5a105e
Merge branch 'master' into fix_eof
ti-chi-bot Nov 28, 2022
8d94ec0
Merge branch 'master' into fix_eof
hawkingrei Nov 28, 2022
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_issue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,9 @@ func TestIssue22231(t *testing.T) {
tk.MustQuery("select cast('2020-05-28 23:59:59 00:00:00' as datetime)").Check(testkit.Rows("2020-05-28 23:59:59"))
tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1292 Truncated incorrect datetime value: '2020-05-28 23:59:59 00:00:00'"))
tk.MustExec("drop table if exists t_issue_22231")

tk.MustQuery("SELECT CAST(\"1111111111-\" AS DATE);")
tk.MustQuery("SHOW WARNINGS").Check(testkit.Rows("Warning 1292 Incorrect datetime value: '1111111111-'"))
}

// TestIssue2612 is related with https://github.com/pingcap/tidb/issues/2612
Expand Down
4 changes: 4 additions & 0 deletions types/time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io"
"math"
"regexp"
"strconv"
Expand Down Expand Up @@ -1155,6 +1156,9 @@ func parseDatetime(sc *stmtctx.StatementContext, str string, fsp int, isFloat bo
hhmmss = true
}
if err != nil {
if err == io.EOF {
return ZeroDatetime, errors.Trace(ErrWrongValue.GenWithStackByArgs(DateTimeStr, str))
}
return ZeroDatetime, errors.Trace(err)
}

Expand Down