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.

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

ddl: allow multiple unique attributes in a column #12165

Merged
merged 13 commits into from
Sep 28, 2019
Merged
12 changes: 12 additions & 0 deletions ddl/db_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,18 @@ func (s *testIntegrationSuite3) TestAlterColumn(c *C) {
_, err = s.tk.Exec("alter table t1 modify column c bigint;")
c.Assert(err, NotNil)
c.Assert(err.Error(), Equals, "[ddl:1071]Specified key was too long; max key length is 3072 bytes")

s.tk.MustExec("drop table if exists multi_unique")
s.tk.MustExec("create table multi_unique (a int unique unique)")
s.tk.MustExec("drop table multi_unique")
s.tk.MustExec("create table multi_unique (a int key primary key unique unique)")
s.tk.MustExec("drop table multi_unique")
s.tk.MustExec("create table multi_unique (a int key unique unique key unique)")
s.tk.MustExec("drop table multi_unique")
s.tk.MustExec("create table multi_unique (a serial serial default value)")
s.tk.MustExec("drop table multi_unique")
s.tk.MustExec("create table multi_unique (a serial serial default value serial default value)")
s.tk.MustExec("drop table multi_unique")
}

func (s *testIntegrationSuite) assertWarningExec(c *C, sql string, expectedWarn *terror.Error) {
Expand Down
8 changes: 7 additions & 1 deletion ddl/ddl_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -527,11 +527,17 @@ func columnDefToCol(ctx sessionctx.Context, offset int, colDef *ast.ColumnDef, o
case ast.ColumnOptionAutoIncrement:
col.Flag |= mysql.AutoIncrementFlag
case ast.ColumnOptionPrimaryKey:
if col.Flag&mysql.PriKeyFlag != 0 {
tangenta marked this conversation as resolved.
Show resolved Hide resolved
continue
}
constraint := &ast.Constraint{Tp: ast.ConstraintPrimaryKey, Keys: keys}
constraints = append(constraints, constraint)
col.Flag |= mysql.PriKeyFlag
case ast.ColumnOptionUniqKey:
constraint := &ast.Constraint{Tp: ast.ConstraintUniqKey, Name: colDef.Name.Name.O, Keys: keys}
constraint := &ast.Constraint{Tp: ast.ConstraintUniqKey, Keys: keys}
if col.Flag&mysql.UniqueFlag != 0 {
continue
}
constraints = append(constraints, constraint)
col.Flag |= mysql.UniqueKeyFlag
case ast.ColumnOptionDefaultValue:
Expand Down