ddl: set column collate from ColumnOptionCollate

ddl/ddl_api.go

@@ -32,6 +32,7 @@ import (
 	"github.com/pingcap/parser/charset"
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/parser/mysql"
+	field_types "github.com/pingcap/parser/types"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/meta/autoid"
@@ -440,6 +441,10 @@ func columnDefToCol(ctx sessionctx.Context, offset int, colDef *ast.ColumnDef, o
 				col.GeneratedStored = v.Stored
 				_, dependColNames := findDependedColumnNames(colDef)
 				col.Dependences = dependColNames
+			case ast.ColumnOptionCollate:
+				if field_types.HasCharset(colDef.Tp) {
+					col.FieldType.Collate = v.StrValue
+				}
 			case ast.ColumnOptionFulltext:
 				ctx.GetSessionVars().StmtCtx.AppendWarning(ErrTableCantHandleFt)
 			}

executor/ddl_test.go

@@ -29,6 +29,7 @@ import (
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/meta/autoid"
 	plannercore "github.com/pingcap/tidb/planner/core"
+	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/types"
@@ -391,26 +392,82 @@ func (s *testSuite3) TestRenameTable(c *C) {
 	tk.MustExec("drop database rename2")
 }
 
-func (s *testSuite3) TestUnsupportedCharset(c *C) {
+func (s *testSuite3) TestColumnCharsetAndCollate(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
-	dbName := "unsupported_charset"
+	dbName := "col_charset_collate"
 	tk.MustExec("create database " + dbName)
 	tk.MustExec("use " + dbName)
 	tests := []struct {
-		charset string
-		valid   bool
+		colType     string
+		charset     string
+		collates    string
+		exptCharset string
+		exptCollate string
+		errMsg      string
 	}{
-		{"charset UTF8 collate UTF8_bin", true},
-		{"charset utf8mb4", true},
-		{"charset utf16", false},
-		{"charset latin1", true},
-		{"charset binary", true},
-		{"charset ascii", true},
+		{
+			colType:     "varchar(10)",
+			charset:     "charset utf8",
+			collates:    "collate utf8_bin",
+			exptCharset: "utf8",
+			exptCollate: "utf8_bin",
+			errMsg:      "",
+		},
+		{
+			colType:     "varchar(10)",
+			charset:     "charset utf8mb4",
+			collates:    "",
+			exptCharset: "utf8mb4",
+			exptCollate: "utf8mb4_bin",
+			errMsg:      "",
+		},
+		{
+			colType:     "varchar(10)",
+			charset:     "charset utf16",
+			collates:    "",
+			exptCharset: "",
+			exptCollate: "",
+			errMsg:      "Unknown charset utf16",
+		},
+		{
+			colType:     "varchar(10)",
+			charset:     "charset latin1",
+			collates:    "",
+			exptCharset: "latin1",
+			exptCollate: "latin1_bin",
+			errMsg:      "",
+		},
+		{
+			colType:     "varchar(10)",
+			charset:     "charset binary",
+			collates:    "",
+			exptCharset: "binary",
+			exptCollate: "binary",
+			errMsg:      "",
+		},
+		{
+			colType:     "varchar(10)",
+			charset:     "charset ascii",
+			collates:    "",
+			exptCharset: "ascii",
+			exptCollate: "ascii_bin",
+			errMsg:      "",
+		},
 	}
+	sctx := tk.Se.(sessionctx.Context)
+	dm := domain.GetDomain(sctx)
 	for i, tt := range tests {
-		sql := fmt.Sprintf("create table t%d (a varchar(10) %s)", i, tt.charset)
-		if tt.valid {
+		tblName := fmt.Sprintf("t%d", i)
+		sql := fmt.Sprintf("create table %s (a %s %s %s)", tblName, tt.colType, tt.charset, tt.collates)
+		if tt.errMsg == "" {
 			tk.MustExec(sql)
+			is := dm.InfoSchema()
+			c.Assert(is, NotNil)
+
+			tb, err := is.TableByName(model.NewCIStr(dbName), model.NewCIStr(tblName))
+			c.Assert(err, IsNil)
+			c.Assert(tb.Meta().Columns[0].Charset, Equals, tt.exptCharset, Commentf(sql))
+			c.Assert(tb.Meta().Columns[0].Collate, Equals, tt.exptCollate, Commentf(sql))
 		} else {
 			_, err := tk.Exec(sql)
 			c.Assert(err, NotNil, Commentf(sql))