ddl: fix sequence default value will cause primary-key occur not-null…

… error (#16437) (#16510)
pingcap · Apr 17, 2020 · cbe75ce · cbe75ce
1 parent cb208cd
commit cbe75ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ddl/ddl_api.go b/ddl/ddl_api.go
@@ -870,7 +870,10 @@ func checkDefaultValue(ctx sessionctx.Context, c *table.Column, hasDefaultValue
 		return nil
 	}
 
-	if c.GetDefaultValue() != nil && !c.DefaultIsExpr {
+	if c.GetDefaultValue() != nil {
+		if c.DefaultIsExpr {
+			return nil
+		}
 		if _, err := table.GetColDefaultValue(ctx, c.ToInfo()); err != nil {
 			return types.ErrInvalidDefault.GenWithStackByArgs(c.Name)
 		}

diff --git a/ddl/sequence_test.go b/ddl/sequence_test.go
@@ -255,6 +255,11 @@ func (s *testSequenceSuite) TestSequenceAsDefaultValue(c *C) {
 	s.tk.MustExec("create sequence seq")
 
 	// test the use sequence's nextval as default.
+	s.tk.MustExec("drop table if exists t")
+	s.tk.MustExec("create table t(a int not null default next value for seq key)")
+	s.tk.MustExec("drop table if exists t")
+	s.tk.MustExec("create table t(a int not null default nextval(seq), b int, primary key(a))")
+
 	s.tk.MustExec("create table t1 (a int default next value for seq)")
 	s.tk.MustGetErrMsg("create table t2 (a char(1) default next value for seq)", "[ddl:8228]Unsupported sequence default value for column type 'a'")