parser: implement Restore for CreateTableStmt

ast/ddl.go

@@ -533,13 +533,15 @@ func (n *Constraint) Restore(ctx *RestoreCtx) error {
 		ctx.WriteKeyWord("UNIQUE KEY")
 	case ConstraintUniqIndex:
 		ctx.WriteKeyWord("UNIQUE INDEX")
-	case ConstraintForeignKey:
-		ctx.WriteKeyWord("FOREIGN KEY")
 	case ConstraintFulltext:
 		ctx.WriteKeyWord("FULLTEXT")
 	}
 
-	if n.Name != "" {
+	if n.Tp == ConstraintForeignKey {
+		ctx.WriteKeyWord("CONSTRAINT ")
+		ctx.WriteName(n.Name)
+		ctx.WriteKeyWord(" FOREIGN KEY ")
+	} else if n.Name != "" {
 		ctx.WritePlain(" ")
 		ctx.WriteName(n.Name)
 	}
@@ -624,9 +626,10 @@ func (n *ColumnDef) Restore(ctx *RestoreCtx) error {
 		}
 	}
 	for i, options := range n.Options {
-		if i > 0 {
-			ctx.WritePlain(",")
-		}
+		//先去掉 > 0 加逗号的逻辑
+		//if i > 0 {
+		//	ctx.WritePlain(",")
+		//}
 		ctx.WritePlain(" ")
 		if err := options.Restore(ctx); err != nil {
 			return errors.Annotatef(err, "An error occurred while splicing ColumnDef ColumnOption: [%v]", i)
@@ -675,7 +678,62 @@ type CreateTableStmt struct {
 
 // Restore implements Node interface.
 func (n *CreateTableStmt) Restore(ctx *RestoreCtx) error {
-	return errors.New("Not implemented")
+	ctx.WriteKeyWord("CREATE TABLE ")
+	if n.IfNotExists {
+		ctx.WriteKeyWord("IF NOT EXISTS ")
+	}
+
+	if err := n.Table.Restore(ctx); err != nil {
+		return errors.Annotate(err, "An error occurred while splicing CreateTableStmt Table")
+	}
+	ctx.WritePlain(" ")
+	if n.ReferTable != nil {
+		ctx.WriteKeyWord("LIKE ")
+		if err := n.ReferTable.Restore(ctx); err != nil {
+			return errors.Annotate(err, "An error occurred while splicing CreateTableStmt ReferTable")
+		}
+	}
+
+	if col := len(n.Cols); col > 0 {
+		ctx.WritePlain("(")
+		for i, col := range n.Cols {
+			if i > 0 {
+				ctx.WritePlain(",")
+			}
+			if err := col.Restore(ctx); err != nil {
+				return errors.Annotatef(err, "An error occurred while splicing CreateTableStmt ColumnDef: [%v]", i)
+			}
+		}
+		for i, constraint := range n.Constraints {
+			if i > 0 || col >= 1 {
+				ctx.WritePlain(",")
+			}
+			if err := constraint.Restore(ctx); err != nil {
+				return errors.Annotatef(err, "An error occurred while splicing CreateTableStmt Constraints: [%v]", i)
+			}
+		}
+		ctx.WritePlain(")")
+	}
+
+	for i, option := range n.Options {
+		ctx.WritePlain(" ")
+		if err := option.Restore(ctx); err != nil {
+			return errors.Annotatef(err, "An error occurred while splicing CreateTableStmt TableOption: [%v]", i)
+		}
+	}
+
+	if n.Partition != nil {
+		ctx.WritePlain(" ")
+		if err := n.Partition.Restore(ctx); err != nil {
+			return errors.Annotate(err, "An error occurred while splicing CreateTableStmt Partition")
+		}
+	}
+	ctx.WritePlain(";")
+	//TODO: Waiting for Create Select
+	//TODO: OnDuplicate
+	//TODO: Select
+
+	return nil
 }
 
 // Accept implements Node Accept interface.
@@ -1320,7 +1378,7 @@ func (n *AlterTableSpec) Restore(ctx *RestoreCtx) error {
 			ctx.WritePlain(")")
 		}
 	case AlterTableAddConstraint:
-		ctx.WriteKeyWord("ADD CONSTRAINT ")
+		ctx.WriteKeyWord("ADD ")
 		if err := n.Constraint.Restore(ctx); err != nil {
 			return errors.Annotate(err, "An error occurred while restore AlterTableSpec.Constraint")
 		}
@@ -1595,3 +1653,52 @@ type PartitionOptions struct {
 	Definitions []*PartitionDefinition
 	Num         uint64
 }
+
+func (n *PartitionOptions) Restore(ctx *RestoreCtx) error {
+	ctx.WriteKeyWord("PARTITION BY ")
+	switch n.Tp {
+	case model.PartitionTypeRange:
+		ctx.WriteKeyWord("RANGE ")
+	case model.PartitionTypeHash:
+		ctx.WriteKeyWord("HASH ")
+	case model.PartitionTypeList:
+		return errors.New("TiDB Parser ignore the `PartitionTypeList` type now")
+	default:
+		return errors.Errorf("invalid model.PartitionType: %d", n.Tp)
+	}
+
+	ctx.WritePlain("(")
+	if err := n.Expr.Restore(ctx); err != nil {
+		return errors.Annotate(err, "An error occurred while restore PartitionOptions Expr")
+	}
+	ctx.WritePlain(") ")
+
+	for i, col := range n.ColumnNames {
+		if i > 0 {
+			ctx.WritePlain(",")
+		}
+		if err := col.Restore(ctx); err != nil {
+			return errors.Annotatef(err, "An error occurred while splicing PartitionOptions ColumnName: [%v]", i)
+		}
+	}
+
+	if n.Num > 0 {
+		ctx.WriteKeyWord("PARTITIONS ")
+		ctx.WritePlainf("%d", n.Num)
+	}
+
+	if len(n.Definitions) > 0 {
+		ctx.WritePlain("(")
+		for i, def := range n.Definitions {
+			if i > 0 {
+				ctx.WritePlain(",")
+			}
+			if err := def.Restore(ctx); err != nil {
+				return errors.Annotatef(err, "An error occurred while splicing PartitionOptions Definitions: [%v]", i)
+			}
+		}
+		ctx.WritePlain(")")
+	}
+
+	return nil
+}

ast/ddl_test.go

@@ -155,8 +155,8 @@ func (ts *testDDLSuite) TestDDLConstraintRestore(c *C) {
 		{"fulltext INDEX full_id (parent_id)", "FULLTEXT `full_id`(`parent_id`)"},
 		{"PRIMARY KEY (id)", "PRIMARY KEY(`id`)"},
 		{"PRIMARY KEY (id) key_block_size = 32 using hash comment 'hello'", "PRIMARY KEY(`id`) KEY_BLOCK_SIZE=32 USING HASH COMMENT 'hello'"},
-		{"FOREIGN KEY (parent_id(2),hello(4)) REFERENCES parent(id) ON DELETE CASCADE", "FOREIGN KEY(`parent_id`(2), `hello`(4)) REFERENCES `parent`(`id`) ON DELETE CASCADE"},
-		{"FOREIGN KEY (parent_id) REFERENCES parent(id) ON DELETE CASCADE ON UPDATE RESTRICT", "FOREIGN KEY(`parent_id`) REFERENCES `parent`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT"},
+		{"CONSTRAINT fk_123 FOREIGN KEY (parent_id(2),hello(4)) REFERENCES parent(id) ON DELETE CASCADE", "CONSTRAINT `fk_123` FOREIGN KEY (`parent_id`(2), `hello`(4)) REFERENCES `parent`(`id`) ON DELETE CASCADE"},
+		{"CONSTRAINT fk_123 FOREIGN KEY (parent_id) REFERENCES parent(id) ON DELETE CASCADE ON UPDATE RESTRICT", "CONSTRAINT `fk_123` FOREIGN KEY (`parent_id`) REFERENCES `parent`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT"},
 	}
 	extractNodeFunc := func(node Node) Node {
 		return node.(*CreateTableStmt).Constraints[0]
@@ -329,18 +329,18 @@ func (ts *testDDLSuite) TestAlterTableSpecRestore(c *C) {
 		{"ADD COLUMN a SMALLINT UNSIGNED FIRST", "ADD COLUMN `a` SMALLINT UNSIGNED FIRST"},
 		{"ADD COLUMN a SMALLINT UNSIGNED AFTER b", "ADD COLUMN `a` SMALLINT UNSIGNED AFTER `b`"},
 		{"ADD COLUMN name mediumtext CHARACTER SET UTF8MB4 COLLATE utf8mb4_unicode_ci NOT NULL", "ADD COLUMN `name` MEDIUMTEXT CHARACTER SET UTF8MB4 COLLATE utf8mb4_unicode_ci NOT NULL"},
-		{"ADD CONSTRAINT INDEX par_ind (parent_id)", "ADD CONSTRAINT INDEX `par_ind`(`parent_id`)"},
-		{"ADD CONSTRAINT INDEX par_ind (parent_id(6))", "ADD CONSTRAINT INDEX `par_ind`(`parent_id`(6))"},
-		{"ADD CONSTRAINT key par_ind (parent_id)", "ADD CONSTRAINT INDEX `par_ind`(`parent_id`)"},
-		{"ADD CONSTRAINT unique par_ind (parent_id)", "ADD CONSTRAINT UNIQUE `par_ind`(`parent_id`)"},
-		{"ADD CONSTRAINT unique key par_ind (parent_id)", "ADD CONSTRAINT UNIQUE `par_ind`(`parent_id`)"},
-		{"ADD CONSTRAINT unique index par_ind (parent_id)", "ADD CONSTRAINT UNIQUE `par_ind`(`parent_id`)"},
-		{"ADD CONSTRAINT fulltext key full_id (parent_id)", "ADD CONSTRAINT FULLTEXT `full_id`(`parent_id`)"},
-		{"ADD CONSTRAINT fulltext INDEX full_id (parent_id)", "ADD CONSTRAINT FULLTEXT `full_id`(`parent_id`)"},
-		{"ADD CONSTRAINT PRIMARY KEY (id)", "ADD CONSTRAINT PRIMARY KEY(`id`)"},
-		{"ADD CONSTRAINT PRIMARY KEY (id) key_block_size = 32 using hash comment 'hello'", "ADD CONSTRAINT PRIMARY KEY(`id`) KEY_BLOCK_SIZE=32 USING HASH COMMENT 'hello'"},
-		{"ADD CONSTRAINT FOREIGN KEY (parent_id(2),hello(4)) REFERENCES parent(id) ON DELETE CASCADE", "ADD CONSTRAINT FOREIGN KEY(`parent_id`(2), `hello`(4)) REFERENCES `parent`(`id`) ON DELETE CASCADE"},
-		{"ADD CONSTRAINT FOREIGN KEY (parent_id) REFERENCES parent(id) ON DELETE CASCADE ON UPDATE RESTRICT", "ADD CONSTRAINT FOREIGN KEY(`parent_id`) REFERENCES `parent`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT"},
+		{"ADD CONSTRAINT INDEX par_ind (parent_id)", "ADD INDEX `par_ind`(`parent_id`)"},
+		{"ADD CONSTRAINT INDEX par_ind (parent_id(6))", "ADD INDEX `par_ind`(`parent_id`(6))"},
+		{"ADD CONSTRAINT key par_ind (parent_id)", "ADD INDEX `par_ind`(`parent_id`)"},
+		{"ADD CONSTRAINT unique par_ind (parent_id)", "ADD UNIQUE `par_ind`(`parent_id`)"},
+		{"ADD CONSTRAINT unique key par_ind (parent_id)", "ADD UNIQUE `par_ind`(`parent_id`)"},
+		{"ADD CONSTRAINT unique index par_ind (parent_id)", "ADD UNIQUE `par_ind`(`parent_id`)"},
+		{"ADD CONSTRAINT fulltext key full_id (parent_id)", "ADD FULLTEXT `full_id`(`parent_id`)"},
+		{"ADD CONSTRAINT fulltext INDEX full_id (parent_id)", "ADD FULLTEXT `full_id`(`parent_id`)"},
+		{"ADD CONSTRAINT PRIMARY KEY (id)", "ADD PRIMARY KEY(`id`)"},
+		{"ADD CONSTRAINT PRIMARY KEY (id) key_block_size = 32 using hash comment 'hello'", "ADD PRIMARY KEY(`id`) KEY_BLOCK_SIZE=32 USING HASH COMMENT 'hello'"},
+		{"ADD CONSTRAINT fk_123 FOREIGN KEY (parent_id(2),hello(4)) REFERENCES parent(id) ON DELETE CASCADE", "ADD CONSTRAINT `fk_123` FOREIGN KEY (`parent_id`(2), `hello`(4)) REFERENCES `parent`(`id`) ON DELETE CASCADE"},
+		{"ADD CONSTRAINT fk_123 FOREIGN KEY (parent_id) REFERENCES parent(id) ON DELETE CASCADE ON UPDATE RESTRICT", "ADD CONSTRAINT `fk_123` FOREIGN KEY (`parent_id`) REFERENCES `parent`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT"},
 		{"DROP COLUMN a", "DROP COLUMN `a`"},
 		{"DROP COLUMN a RESTRICT", "DROP COLUMN `a`"},
 		{"DROP COLUMN a CASCADE", "DROP COLUMN `a`"},

ast/util_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pingcap/parser"
 	. "github.com/pingcap/parser/ast"
 	. "github.com/pingcap/parser/format"
-	driver "github.com/pingcap/tidb/types/parser_driver"
+	"github.com/pingcap/tidb/types/parser_driver"
 )
 
 var _ = Suite(&testCacheableSuite{})
@@ -66,6 +66,12 @@ type nodeTextCleaner struct {
 func (checker *nodeTextCleaner) Enter(in Node) (out Node, skipChildren bool) {
 	in.SetText("")
 	switch node := in.(type) {
+	case *Constraint:
+		if node.Option != nil {
+			if node.Option.KeyBlockSize == 0x0 && node.Option.Tp == 0 && node.Option.Comment == "" {
+				node.Option = nil
+			}
+		}
 	case *FuncCallExpr:
 		node.FnName.O = strings.ToLower(node.FnName.O)
 		switch node.FnName.L {

parser.y

@@ -6503,16 +6503,26 @@ TableOption:
 	}
 |	"STATS_PERSISTENT" EqOpt StatsPersistentVal
 	{
-		$$ = &ast.TableOption{Tp: ast.TableOptionStatsPersistent}
+                switch $3.(type) {
+                case uint64:
+                        $$ = &ast.TableOption{Tp: ast.TableOptionStatsPersistent, UintValue: $3.(uint64)}
+                default:
+                        $$ = &ast.TableOption{Tp: ast.TableOptionStatsPersistent, StrValue: "DEFAULT"}
+                }
+
 	}
 |	"SHARD_ROW_ID_BITS" EqOpt LengthNum
 	{
 		$$ = &ast.TableOption{Tp: ast.TableOptionShardRowID, UintValue: $3.(uint64)}
 	}
 |	"PACK_KEYS" EqOpt StatsPersistentVal
 	{
-		// Parse it but will ignore it.
-		$$ = &ast.TableOption{Tp: ast.TableOptionPackKeys}
+		switch $3.(type) {
+                case uint64:
+                    $$ = &ast.TableOption{Tp: ast.TableOptionPackKeys, UintValue: $3.(uint64)}
+                default:
+                    $$ = &ast.TableOption{Tp: ast.TableOptionPackKeys, StrValue: "DEFAULT"}
+                }
 	}
 
 StatsPersistentVal: