From 5a8c690ff62c29b5f1c9ea83abbac47719bc06e5 Mon Sep 17 00:00:00 2001 From: milkice Date: Wed, 18 Aug 2021 16:42:26 +0800 Subject: [PATCH] Set Collate in types.FieldType --- parser.y | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/parser.y b/parser.y index 8224d8b2f..059d28053 100644 --- a/parser.y +++ b/parser.y @@ -2804,7 +2804,14 @@ ColumnDefList: ColumnDef: ColumnName Type ColumnOptionListOpt { - colDef := &ast.ColumnDef{Name: $1.(*ast.ColumnName), Tp: $2.(*types.FieldType), Options: $3.([]*ast.ColumnOption)} + tp := $2.(*types.FieldType) + for _, opt := range $3.([]*ast.ColumnOption) { + if opt.Tp == ast.ColumnOptionCollate { + tp.Collate = opt.StrValue + break + } + } + colDef := &ast.ColumnDef{Name: $1.(*ast.ColumnName), Tp: tp, Options: $3.([]*ast.ColumnOption)} if !colDef.Validate() { yylex.AppendError(yylex.Errorf("Invalid column definition")) return 1