address comment, support primary key without column defs

Signed-off-by: lysu <sulifx@gmail.com>
pingcap · Mar 11, 2021 · b54bf6e · b54bf6e
1 parent 404be82
commit b54bf6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sessionctx/binloginfo/binloginfo_test.go b/sessionctx/binloginfo/binloginfo_test.go
@@ -619,8 +619,12 @@ func (s *testBinlogSuite) TestAddSpecialComment(c *C) {
 			"create table t1(id int, v int, primary key(a) /*T![clustered_index] clustered */ );",
 		},
 		{
-			"create table t1(id int primary key clustered, v int);", // CDC upstream => downstream never produce this
 			"create table t1(id int primary key clustered, v int);",
+			"create table t1(id int primary key /*T![clustered_index] clustered */ , v int);",
+		},
+		{
+			"alter table t add primary key(a) clustered;",
+			"alter table t add primary key(a) /*T![clustered_index] clustered */ ;",
 		},
 		{
 			"create table t1 (id int, a varchar(255), primary key (a, b) nonclustered);",

diff --git a/types/parser_driver/special_cmt_ctrl.go b/types/parser_driver/special_cmt_ctrl.go
@@ -68,5 +68,5 @@ var FeatureIDPatterns = map[featureID]*regexp.Regexp{
 	FeatureIDAutoRandom:     regexp.MustCompile(`(?P<REPLACE>(?i)AUTO_RANDOM\b\s*(\s*\(\s*\d+\s*\)\s*)?)`),
 	FeatureIDAutoIDCache:    regexp.MustCompile(`(?P<REPLACE>(?i)AUTO_ID_CACHE\s*=?\s*\d+\s*)`),
 	FeatureIDAutoRandomBase: regexp.MustCompile(`(?P<REPLACE>(?i)AUTO_RANDOM_BASE\s*=?\s*\d+\s*)`),
-	FeatureClusteredIndex:   regexp.MustCompile(`(?i)PRIMARY\s+KEY\s*\(.*\)\s+(?P<REPLACE>(NON)?CLUSTERED\b)`),
+	FeatureClusteredIndex:   regexp.MustCompile(`(?i)PRIMARY\s+KEY(\s*\(.*\))?\s+(?P<REPLACE>(NON)?CLUSTERED\b)`),
 }