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

ddl: allow multiple unique attributes in a column #12165

Merged
merged 13 commits into from
Sep 28, 2019
Merged

ddl: allow multiple unique attributes in a column #12165

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e587dfd
ddl: allow multiple unique attributes in column
tangenta Sep 11, 2019
f67e4da
Merge branch 'master' into fix-multi-unique
tangenta Sep 12, 2019
d3c44a5
Merge branch 'master' into fix-multi-unique
tangenta Sep 12, 2019
53f59d6
Merge branch 'master' into fix-multi-unique
tangenta Sep 12, 2019
b98550f
Merge branch 'master' into fix-multi-unique
tangenta Sep 16, 2019
36a90e5
add check to avoid adding multiple constraints
tangenta Sep 17, 2019
af9bf91
Merge branch 'fix-multi-unique' of github.com:tangenta/tidb into fix-…
tangenta Sep 17, 2019
9d7fe77
Merge remote-tracking branch 'upstream/master' into fix-multi-unique
tangenta Sep 17, 2019
920a23a
add comments
tangenta Sep 18, 2019
0f24039
fix mistake
tangenta Sep 18, 2019
9905e98
Merge branch 'master' into fix-multi-unique
tangenta Sep 18, 2019
ce8d595
Merge branch 'master' into fix-multi-unique
tangenta Sep 23, 2019
fa6ea78
Merge branch 'master' into fix-multi-unique
tangenta Sep 28, 2019
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
6 changes: 6 additions & 0 deletions ddl/ddl_api.go
View file
Open in desktop
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, Keys: keys}
if col.Flag&mysql.UniqueFlag != 0 {
continue
}
constraints = append(constraints, constraint)
col.Flag |= mysql.UniqueKeyFlag
case ast.ColumnOptionDefaultValue:
Expand Down