put pk in indices and revert test

pingcap · Dec 11, 2019 · 157d14e · 157d14e
1 parent b8a36f1
commit 157d14e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/pkg/dbutil/index_test.go b/pkg/dbutil/index_test.go
@@ -45,8 +45,8 @@ func (*testDBSuite) TestIndex(c *C) {
  				PRIMARY KEY (a)
  			) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin
  			`,
-			[]string{"b", "c"},
-			[]string{"b", "c"},
+			[]string{"PRIMARY", "b", "c"},
+			[]string{"a", "b", "c"},
 		}, {
 			`
  			CREATE TABLE mtest (

diff --git a/pkg/dbutil/table.go b/pkg/dbutil/table.go
@@ -54,6 +54,22 @@ func GetTableInfoBySQL(createTableSQL string, sqlMode string) (table *model.Tabl
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
+
+		// put primary key in indices
+		if table.PKIsHandle {
+			pkIndex := &model.IndexInfo{
+				Name:    model.NewCIStr("PRIMARY"),
+				Primary: true,
+				Columns: []*model.IndexColumn{
+					{
+						Name: table.GetPkName(),
+					},
+				},
+			}
+
+			table.Indices = append(table.Indices, pkIndex)
+		}
+
 		return table, nil
 	}
 

diff --git a/pkg/diff/util_test.go b/pkg/diff/util_test.go
@@ -44,7 +44,7 @@ func (s *testUtilSuite) TestIgnoreColumns(c *C) {
 	c.Assert(err, IsNil)
 	tbInfo = ignoreColumns(tableInfo3, []string{"b", "c"})
 	c.Assert(tbInfo.Columns, HasLen, 2)
-	c.Assert(tbInfo.Indices, HasLen, 0)
+	c.Assert(tbInfo.Indices, HasLen, 1)
 }
 
 func (s *testUtilSuite) TestRowContainsCols(c *C) {