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

ddl: Allow create timestamp default 0 without sql_mode NO_ZERO_DATE (#30305) #30507

Merged
merged 8 commits into from
Dec 28, 2021
Merged

ddl: Allow create timestamp default 0 without sql_mode NO_ZERO_DATE (#30305) #30507

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ae885d
Allow create timestamp default 0 without sql_mode NO_ZERO_DATE
mjonss Dec 8, 2021
6b6f642
fixed compatibility with MySQL for both create and alter table
mjonss Dec 17, 2021
29726dd
Merge remote-tracking branch 'pingcap/master' into issue-30305-ts-def-0
mjonss Dec 17, 2021
e46819c
Updated test with more variants
mjonss Dec 17, 2021
1c830fc
Merge branch 'master' into issue-30305-ts-def-0
bb7133 Dec 27, 2021
6b321af
Merge branch 'master' into issue-30305-ts-def-0
ti-chi-bot Dec 28, 2021
16c0f85
Merge branch 'master' into issue-30305-ts-def-0
ti-chi-bot Dec 28, 2021
f3e1640
Merge branch 'master' into issue-30305-ts-def-0
ti-chi-bot Dec 28, 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 ddl/backfilling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ func (w *worker) writePhysicalTableRecord(t table.PhysicalTable, bfWorkerType ba
sessCtx.GetSessionVars().StmtCtx.AllowInvalidDate = sqlMode.HasAllowInvalidDatesMode()
sessCtx.GetSessionVars().StmtCtx.DividedByZeroAsWarning = !sqlMode.HasStrictMode()
sessCtx.GetSessionVars().StmtCtx.IgnoreZeroInDate = !sqlMode.HasStrictMode() || sqlMode.HasAllowInvalidDatesMode()
sessCtx.GetSessionVars().StmtCtx.NoZeroDate = sqlMode.HasStrictMode()

switch bfWorkerType {
case typeAddIndexWorker:
Expand Down
42 changes: 42 additions & 0 deletions ddl/db_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,48 @@ func (s *testIntegrationSuite5) TestNoZeroDateMode(c *C) {
tk.MustGetErrCode("create table test_zero_date(agent_start_time timestamp NOT NULL DEFAULT '0000-00-00 00:00:00')", errno.ErrInvalidDefault)
tk.MustGetErrCode("create table test_zero_date(a timestamp default '0000-00-00 00');", errno.ErrInvalidDefault)
tk.MustGetErrCode("create table test_zero_date(a timestamp default 0);", errno.ErrInvalidDefault)
defer tk.MustExec(`drop table if exists test_zero_date`)
tk.MustExec("set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';")
tk.MustExec("create table test_zero_date (a timestamp default 0)")
tk.MustExec(`insert into test_zero_date values (0)`)
tk.MustQuery(`select a, unix_timestamp(a) from test_zero_date`).Check(testkit.Rows("0000-00-00 00:00:00 0"))
tk.MustExec(`update test_zero_date set a = '2001-01-01 11:11:11' where a = 0`)
tk.MustExec(`replace into test_zero_date values (0)`)
tk.MustExec(`delete from test_zero_date where a = 0`)
tk.MustExec(`update test_zero_date set a = 0 where a = '2001-01-01 11:11:11'`)
tk.MustExec("set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';")
tk.MustGetErrCode(`insert into test_zero_date values (0)`, errno.ErrTruncatedWrongValue)
tk.MustGetErrCode(`replace into test_zero_date values (0)`, errno.ErrTruncatedWrongValue)
tk.MustGetErrCode(`update test_zero_date set a = 0 where a = 0`, errno.ErrTruncatedWrongValue)
tk.MustExec(`delete from test_zero_date where a = 0`)
tk.MustQuery(`select a, unix_timestamp(a) from test_zero_date`).Check(testkit.Rows())
tk.MustExec(`drop table test_zero_date`)
tk.MustExec("set session sql_mode=''")
tk.MustExec("create table test_zero_date (a timestamp default 0)")
tk.MustExec(`drop table test_zero_date`)
tk.MustExec(`create table test_zero_date (a int)`)
tk.MustExec(`insert into test_zero_date values (0)`)
tk.MustExec(`alter table test_zero_date modify a date`)
tk.MustExec("set session sql_mode='NO_ZERO_DATE'")
tk.MustExec(`drop table test_zero_date`)
tk.MustExec("create table test_zero_date (a timestamp default 0)")
tk.MustExec(`drop table test_zero_date`)
tk.MustExec(`create table test_zero_date (a int)`)
tk.MustExec(`insert into test_zero_date values (0)`)
tk.MustExec(`alter table test_zero_date modify a date`)
tk.MustExec("set session sql_mode='STRICT_TRANS_TABLES'")
tk.MustExec(`drop table test_zero_date`)
tk.MustExec("create table test_zero_date (a timestamp default 0)")
tk.MustExec(`drop table test_zero_date`)
tk.MustExec(`create table test_zero_date (a int)`)
tk.MustExec(`insert into test_zero_date values (0)`)
tk.MustGetErrCode(`alter table test_zero_date modify a date`, errno.ErrTruncatedWrongValue)
tk.MustExec("set session sql_mode='NO_ZERO_DATE,STRICT_TRANS_TABLES'")
tk.MustExec(`drop table test_zero_date`)
tk.MustGetErrCode("create table test_zero_date (a timestamp default 0)", errno.ErrInvalidDefault)
tk.MustExec(`create table test_zero_date (a int)`)
tk.MustExec(`insert into test_zero_date values (0)`)
tk.MustGetErrCode(`alter table test_zero_date modify a date`, errno.ErrTruncatedWrongValue)
}

func (s *testIntegrationSuite2) TestInvalidDefault(c *C) {
Expand Down
2 changes: 2 additions & 0 deletions executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,6 +1778,8 @@ func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) {
sc.InCreateOrAlterStmt = true
sc.AllowInvalidDate = vars.SQLMode.HasAllowInvalidDatesMode()
sc.IgnoreZeroInDate = !vars.SQLMode.HasNoZeroInDateMode() || !vars.StrictSQLMode || sc.AllowInvalidDate
sc.NoZeroDate = vars.SQLMode.HasNoZeroDateMode()
sc.TruncateAsWarning = !vars.StrictSQLMode
case *ast.LoadDataStmt:
sc.DupKeyAsWarning = true
sc.BadNullAsWarning = true
Expand Down
1 change: 1 addition & 0 deletions sessionctx/stmtctx/stmtctx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ type StatementContext struct {
InCreateOrAlterStmt bool
IgnoreTruncate bool
IgnoreZeroInDate bool
NoZeroDate bool
DupKeyAsWarning bool
BadNullAsWarning bool
DividedByZeroAsWarning bool
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 @@ -1988,7 +1988,7 @@ func ParseTimeFromNum(sc *stmtctx.StatementContext, num int64, tp byte, fsp int8
// MySQL compatibility: 0 should not be converted to null, see #11203
if num == 0 {
zt := NewTime(ZeroCoreTime, tp, DefaultFsp)
if sc != nil && sc.InCreateOrAlterStmt && !sc.TruncateAsWarning {
if sc != nil && sc.InCreateOrAlterStmt && !sc.TruncateAsWarning && sc.NoZeroDate {
switch tp {
case mysql.TypeTimestamp:
return zt, ErrTruncatedWrongVal.GenWithStackByArgs(TimestampStr, "0")
Expand Down