parser: add support for ALTER DATABASE syntax (#318)

pingcap · May 9, 2019 · 7a8657e · 7a8657e
1 parent e336082
commit 7a8657e
Show file tree

Hide file tree

Showing 7 changed files with 5,259 additions and 5,103 deletions.
diff --git a/ast/ddl.go b/ast/ddl.go
@@ -98,11 +98,11 @@ func (n *CreateDatabaseStmt) Restore(ctx *RestoreCtx) error {
 		ctx.WriteKeyWord("IF NOT EXISTS ")
 	}
 	ctx.WriteName(n.Name)
-	for _, option := range n.Options {
+	for i, option := range n.Options {
 		ctx.WritePlain(" ")
 		err := option.Restore(ctx)
 		if err != nil {
-			return errors.Trace(err)
+			return errors.Annotatef(err, "An error occurred while splicing CreateDatabaseStmt DatabaseOption: [%v]", i)
 		}
 	}
 	return nil
@@ -118,6 +118,43 @@ func (n *CreateDatabaseStmt) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
+// AlterDatabaseStmt is a statement to change the structure of a database.
+// See https://dev.mysql.com/doc/refman/5.7/en/alter-database.html
+type AlterDatabaseStmt struct {
+	ddlNode
+
+	Name                 string
+	AlterDefaultDatabase bool
+	Options              []*DatabaseOption
+}
+
+// Restore implements Node interface.
+func (n *AlterDatabaseStmt) Restore(ctx *RestoreCtx) error {
+	ctx.WriteKeyWord("ALTER DATABASE")
+	if !n.AlterDefaultDatabase {
+		ctx.WritePlain(" ")
+		ctx.WriteName(n.Name)
+	}
+	for i, option := range n.Options {
+		ctx.WritePlain(" ")
+		err := option.Restore(ctx)
+		if err != nil {
+			return errors.Annotatef(err, "An error occurred while splicing AlterDatabaseStmt DatabaseOption: [%v]", i)
+		}
+	}
+	return nil
+}
+
+// Accept implements Node Accept interface.
+func (n *AlterDatabaseStmt) Accept(v Visitor) (Node, bool) {
+	newNode, skipChildren := v.Enter(n)
+	if skipChildren {
+		return v.Leave(newNode)
+	}
+	n = newNode.(*AlterDatabaseStmt)
+	return v.Leave(n)
+}
+
 // DropDatabaseStmt is a statement to drop a database and all tables in the database.
 // See https://dev.mysql.com/doc/refman/5.7/en/drop-database.html
 type DropDatabaseStmt struct {

diff --git a/ast/ddl_test.go b/ast/ddl_test.go
@@ -35,6 +35,7 @@ func (ts *testDDLSuite) TestDDLVisitorCover(c *C) {
 		expectedLeaveCnt int
 	}{
 		{&CreateDatabaseStmt{}, 0, 0},
+		{&AlterDatabaseStmt{}, 0, 0},
 		{&DropDatabaseStmt{}, 0, 0},
 		{&DropIndexStmt{Table: &TableName{}}, 0, 0},
 		{&DropTableStmt{Tables: []*TableName{{}, {}}}, 0, 0},

diff --git a/model/ddl.go b/model/ddl.go
@@ -29,63 +29,65 @@ 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
-	ActionModifyTableCharsetAndCollate ActionType = 22
-	ActionTruncateTablePartition       ActionType = 23
-	ActionDropView                     ActionType = 24
-	ActionRecoverTable                 ActionType = 25
+	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
+	ActionTruncateTablePartition        ActionType = 23
+	ActionDropView                      ActionType = 24
+	ActionRecoverTable                  ActionType = 25
+	ActionModifySchemaCharsetAndCollate ActionType = 26
 )
 
 // AddIndexStr is a string related to the operation of "add index".
 const AddIndexStr = "add index"
 
 var actionMap = map[ActionType]string{
-	ActionCreateSchema:                 "create schema",
-	ActionDropSchema:                   "drop schema",
-	ActionCreateTable:                  "create table",
-	ActionDropTable:                    "drop table",
-	ActionAddColumn:                    "add column",
-	ActionDropColumn:                   "drop column",
-	ActionAddIndex:                     AddIndexStr,
-	ActionDropIndex:                    "drop index",
-	ActionAddForeignKey:                "add foreign key",
-	ActionDropForeignKey:               "drop foreign key",
-	ActionTruncateTable:                "truncate table",
-	ActionModifyColumn:                 "modify column",
-	ActionRebaseAutoID:                 "rebase auto_increment ID",
-	ActionRenameTable:                  "rename table",
-	ActionSetDefaultValue:              "set default value",
-	ActionShardRowID:                   "shard row ID",
-	ActionModifyTableComment:           "modify table comment",
-	ActionRenameIndex:                  "rename index",
-	ActionAddTablePartition:            "add partition",
-	ActionDropTablePartition:           "drop partition",
-	ActionCreateView:                   "create view",
-	ActionModifyTableCharsetAndCollate: "modify table charset and collate",
-	ActionTruncateTablePartition:       "truncate partition",
-	ActionDropView:                     "drop view",
-	ActionRecoverTable:                 "recover table",
+	ActionCreateSchema:                  "create schema",
+	ActionDropSchema:                    "drop schema",
+	ActionCreateTable:                   "create table",
+	ActionDropTable:                     "drop table",
+	ActionAddColumn:                     "add column",
+	ActionDropColumn:                    "drop column",
+	ActionAddIndex:                      AddIndexStr,
+	ActionDropIndex:                     "drop index",
+	ActionAddForeignKey:                 "add foreign key",
+	ActionDropForeignKey:                "drop foreign key",
+	ActionTruncateTable:                 "truncate table",
+	ActionModifyColumn:                  "modify column",
+	ActionRebaseAutoID:                  "rebase auto_increment ID",
+	ActionRenameTable:                   "rename table",
+	ActionSetDefaultValue:               "set default value",
+	ActionShardRowID:                    "shard row ID",
+	ActionModifyTableComment:            "modify table comment",
+	ActionRenameIndex:                   "rename index",
+	ActionAddTablePartition:             "add partition",
+	ActionDropTablePartition:            "drop partition",
+	ActionCreateView:                    "create view",
+	ActionModifyTableCharsetAndCollate:  "modify table charset and collate",
+	ActionTruncateTablePartition:        "truncate partition",
+	ActionDropView:                      "drop view",
+	ActionRecoverTable:                  "recover table",
+	ActionModifySchemaCharsetAndCollate: "modify schema charset and collate",
 }
 
 // String return current ddl action in string

diff --git a/model/model_test.go b/model/model_test.go
@@ -280,6 +280,7 @@ func (testModelSuite) TestString(c *C) {
 		{ActionDropIndex, "drop index"},
 		{ActionAddColumn, "add column"},
 		{ActionDropColumn, "drop column"},
+		{ActionModifySchemaCharsetAndCollate, "modify schema charset and collate"},
 	}
 
 	for _, v := range acts {