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

*: add ActionModifyTableCharsetAndCollate to support alter table charset and collate #14

Merged
merged 10 commits into from
Dec 10, 2018
Merged

*: add ActionModifyTableCharsetAndCollate to support alter table charset and collate #14

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d4464cd
*: add ActionModifyTableCharsetAndCollate to support alter table char…
winkyao Nov 5, 2018
04e30ab
Merge remote-tracking branch 'upstream/master' into support_alter_tab…
winkyao Nov 12, 2018
d8af28b
Merge branch 'master' into support_alter_table_charset
winkyao Dec 3, 2018
ebd2081
Merge remote-tracking branch 'upstream/master' into support_alter_tab…
winkyao Dec 4, 2018
db135ad
Merge branch 'support_alter_table_charset' of github.com:winkyao/pars…
winkyao Dec 4, 2018
921d258
address comment
winkyao Dec 6, 2018
37ef416
Merge branch 'master' into support_alter_table_charset
winkyao Dec 7, 2018
9b3dff0
Merge branch 'master' into support_alter_table_charset
winkyao Dec 10, 2018
836e4f9
addresss comment
winkyao Dec 10, 2018
ed17dab
Merge branch 'support_alter_table_charset' of github.com:winkyao/pars…
winkyao Dec 10, 2018
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
2 changes: 2 additions & 0 deletions ast/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,8 @@ type TableOption struct {
Tp TableOptionType
StrValue string
UintValue uint64
// Skipped indicate the TableOption can be skipped.
Skipped bool
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this field is confusing, it's not something belong to TableOption

}

// ColumnPositionType is the type for ColumnPosition.
Expand Down
45 changes: 23 additions & 22 deletions model/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,29 @@ type ActionType byte

// List DDL actions.
const (
ActionNone ActionType = 0
ActionCreateSchema ActionType = 1
ActionDropSchema ActionType = 2
ActionCreateTable ActionType = 3
ActionDropTable ActionType = 4
ActionAddColumn ActionType = 5
ActionDropColumn ActionType = 6
ActionAddIndex ActionType = 7
ActionDropIndex ActionType = 8
ActionAddForeignKey ActionType = 9
ActionDropForeignKey ActionType = 10
ActionTruncateTable ActionType = 11
ActionModifyColumn ActionType = 12
ActionRebaseAutoID ActionType = 13
ActionRenameTable ActionType = 14
ActionSetDefaultValue ActionType = 15
ActionShardRowID ActionType = 16
ActionModifyTableComment ActionType = 17
ActionRenameIndex ActionType = 18
ActionAddTablePartition ActionType = 19
ActionDropTablePartition ActionType = 20
ActionCreateView ActionType = 21
ActionNone ActionType = 0
ActionCreateSchema ActionType = 1
ActionDropSchema ActionType = 2
ActionCreateTable ActionType = 3
ActionDropTable ActionType = 4
ActionAddColumn ActionType = 5
ActionDropColumn ActionType = 6
ActionAddIndex ActionType = 7
ActionDropIndex ActionType = 8
ActionAddForeignKey ActionType = 9
ActionDropForeignKey ActionType = 10
ActionTruncateTable ActionType = 11
ActionModifyColumn ActionType = 12
ActionRebaseAutoID ActionType = 13
ActionRenameTable ActionType = 14
ActionSetDefaultValue ActionType = 15
ActionShardRowID ActionType = 16
ActionModifyTableComment ActionType = 17
ActionRenameIndex ActionType = 18
ActionAddTablePartition ActionType = 19
ActionDropTablePartition ActionType = 20
ActionCreateView ActionType = 21
ActionModifyTableCharsetAndCollate ActionType = 22
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need change var actionMap = map[ActionType]string ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address

)

// AddIndexStr is a string related to the operation of "add index".
Expand Down