database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #395 from winkyao/master

Browse Source 
parser/parser.y: add StringType OptCharset OptCollate support
This commit is contained in:
Shen Li
2015-10-15 16:47:37 +08:00
parent 3fab6c405f 7ef47ddd1f
commit f45d2d9bcd
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parser/parser.y
View File

@ -3868,21 +3868,25 @@ BitValueType:
}
StringType:
NationalOpt "CHAR" FieldLen OptBinary
NationalOpt "CHAR" FieldLen OptBinary OptCharset OptCollate
{
x := types.NewFieldType(mysql.TypeString)
x.Flen = $3.(int)
if $4.(bool) {
x.Flag |= mysql.BinaryFlag
}
x.Charset = $5.(string)
x.Collate = $6.(string)
$$ = x
}
| NationalOpt "CHAR" OptBinary
| NationalOpt "CHAR" OptBinary OptCharset OptCollate
{
x := types.NewFieldType(mysql.TypeString)
if $3.(bool) {
x.Flag |= mysql.BinaryFlag
}
x.Charset = $4.(string)
x.Collate = $5.(string)
$$ = x
}
| NationalOpt "VARCHAR" FieldLen OptBinary OptCharset OptCollate

5
parser/parser_test.go
View File

@ -442,6 +442,11 @@ func (s *testParserSuite) TestDDL(c *C) {
{"CREATE TABLE foo (a SMALLINT UNSIGNED, b INT UNSIGNED) // foo", true},
{"CREATE TABLE foo (a SMALLINT UNSIGNED, b INT UNSIGNED) /* foo */", true},
{"CREATE TABLE foo /* foo */ (a SMALLINT UNSIGNED, b INT UNSIGNED) /* foo */", true},
{"CREATE TABLE foo (name CHAR(50) BINARY)", true},
{"CREATE TABLE foo (name CHAR(50) COLLATE utf8_bin)", true},
{"CREATE TABLE foo (name CHAR(50) CHARACTER SET utf8)", true},
{"CREATE TABLE foo (name CHAR(50) BINARY CHARACTER SET utf8 COLLATE utf8_bin)", true},
{"CREATE TABLE foo (a.b, b);", false},
{"CREATE TABLE foo (a, b.c);", false},
// For table option