parser: fix remove partitioning syntax (pingcap#396)

* add support for REMOVE PARTITIONING syntax * remove unused value * add type for AlterTableSpec * indent with tab * indent with tab
tiancaiamao · Jul 26, 2019 · b2776f8 · b2776f8
1 parent 595f527
commit b2776f8
Show file tree

Hide file tree

Showing 5 changed files with 6,919 additions and 6,852 deletions.
diff --git a/ast/ddl.go b/ast/ddl.go
@@ -1705,6 +1705,7 @@ const (
 	AlterTablePartition
 	AlterTableEnableKeys
 	AlterTableDisableKeys
+	AlterTableRemovePartitioning
 
 	// TODO: Add more actions
 )
@@ -1998,6 +1999,8 @@ func (n *AlterTableSpec) Restore(ctx *RestoreCtx) error {
 		ctx.WriteKeyWord("ENABLE KEYS")
 	case AlterTableDisableKeys:
 		ctx.WriteKeyWord("DISABLE KEYS")
+	case AlterTableRemovePartitioning:
+		ctx.WriteKeyWord("REMOVE PARTITIONING")
 	default:
 		// TODO: not support
 		ctx.WritePlainf(" /* AlterTableType(%d) is not supported */ ", n.Tp)
@@ -2066,7 +2069,7 @@ func (n *AlterTableStmt) Restore(ctx *RestoreCtx) error {
 		return errors.Annotate(err, "An error occurred while restore AlterTableStmt.Table")
 	}
 	for i, spec := range n.Specs {
-		if i == 0 || spec.Tp == AlterTablePartition {
+		if i == 0 || spec.Tp == AlterTablePartition || spec.Tp == AlterTableRemovePartitioning {
 			ctx.WritePlain(" ")
 		} else {
 			ctx.WritePlain(", ")

diff --git a/misc.go b/misc.go
@@ -408,6 +408,7 @@ var tokenMap = map[string]int{
 	"PAGE":                     pageSym,
 	"PARTIAL":                  partial,
 	"PARTITION":                partition,
+	"PARTITIONING":             partitioning,
 	"PARTITIONS":               partitions,
 	"PASSWORD":                 password,
 	"PESSIMISTIC":              pessimistic,
@@ -440,6 +441,7 @@ var tokenMap = map[string]int{
 	"REGEXP":                   regexpKwd,
 	"REGIONS":                  regions,
 	"RELOAD":                   reload,
+	"REMOVE":                   remove,
 	"RENAME":                   rename,
 	"REPEAT":                   repeat,
 	"REPEATABLE":               repeatable,