Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

parser: support long varchar #5920

Merged
merged 10 commits into from
Mar 3, 2018
Merged

parser: support long varchar #5920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d92cbf
support long varchar
zhexuany Feb 28, 2018
8eeea59
add test case
zhexuany Feb 28, 2018
3e84bae
use tab instead of space
zhexuany Feb 28, 2018
1a88c10
Merge branch 'master' into fix_issue_5918
zhexuany Feb 28, 2018
afcec7b
Merge branch 'master' into fix_issue_5918
zhexuany Mar 1, 2018
f9f6b83
Merge branch 'master' into fix_issue_5918
zhexuany Mar 1, 2018
1759967
Merge branch 'master' into fix_issue_5918
zz-jason Mar 2, 2018
bf76c9f
Merge branch 'master' into fix_issue_5918
zhexuany Mar 2, 2018
252bb93
Merge branch 'master' into fix_issue_5918
ngaut Mar 3, 2018
ac3f30c
Merge branch 'master' into fix_issue_5918
ngaut Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions parser/misc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ var tokenMap = map[string]int{
"LOCALTIME": localTime,
"LOCALTIMESTAMP": localTs,
"LOCK": lock,
"LONG": long,
"LONGBLOB": longblobType,
"LONGTEXT": longtextType,
"LOW_PRIORITY": lowPriority,
Expand Down
6 changes: 6 additions & 0 deletions parser/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ import (
utcTimestamp "UTC_TIMESTAMP"
utcTime "UTC_TIME"
values "VALUES"
long "LONG"
varcharType "VARCHAR"
varbinaryType "VARBINARY"
virtual "VIRTUAL"
Expand Down Expand Up @@ -5724,6 +5725,11 @@ TextType:
x := types.NewFieldType(mysql.TypeLongBlob)
$$ = x
}
| "LONG" "VARCHAR"
{
x := types.NewFieldType(mysql.TypeMediumBlob)
$$ = x
}


DateAndTimeType:
Expand Down
3 changes: 3 additions & 0 deletions parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,6 +1591,9 @@ func (s *testParserSuite) TestDDL(c *C) {

// for issue 4740
{"create table t (a int1, b int2, c int3, d int4, e int8)", true},

// for issue 5918
{"create table t (lv long varchar null)", true},
}
s.RunTest(c, table)
}
Expand Down