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

Merge pull request #332 from pingcap/siddontang/row-column-name

Browse Source 
parser: row is an unserved key word
This commit is contained in:
goroutine
2015-10-08 17:34:28 +08:00
parent 2e6fd071b6 2a5f7b6912
commit 5e642bb345
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser/parser.y
View File

@ -1635,7 +1635,7 @@ UnReservedKeyword:
| "START" | "GLOBAL" | "TABLES"| "TEXT" | "TIME" | "TIMESTAMP" | "TRANSACTION" | "TRUNCATE" | "UNKNOWN"
| "VALUE" | "WARNINGS" | "YEAR" | "MODE" | "WEEK" | "ANY" | "SOME" | "USER" | "IDENTIFIED" | "COLLATION"
| "COMMENT" | "AVG_ROW_LENGTH" | "CONNECTION" | "CHECKSUM" | "COMPRESSION" | "KEY_BLOCK_SIZE" | "MAX_ROWS" | "MIN_ROWS"
| "NATIONAL"
| "NATIONAL" | "ROW"
NotKeywordToken:
"ABS" | "COALESCE" | "CONCAT" | "CONCAT_WS" | "COUNT" | "DAY" | "DAYOFMONTH" | "DAYOFWEEK" | "DAYOFYEAR" | "FOUND_ROWS" | "GROUP_CONCAT"

3
parser/parser_test.go
View File

@ -317,6 +317,7 @@ func (s *testParserSuite) TestParser0(c *C) {
{"select (1, 1,)", false},
{"select row(1, 1) > row(1, 1), row(1, 1, 1) > row(1, 1, 1)", true},
{"Select (1, 1) > (1, 1)", true},
{"create table t (row int)", true},
// For SHOW statement
{"SHOW VARIABLES LIKE 'character_set_results'", true},
@ -516,7 +517,7 @@ func (s *testParserSuite) TestParser0(c *C) {
"start", "global", "tables", "text", "time", "timestamp", "transaction", "truncate", "unknown",
"value", "warnings", "year", "now", "substring", "mode", "any", "some", "user", "identified",
"collation", "comment", "avg_row_length", "checksum", "compression", "connection", "key_block_size",
"max_rows", "min_rows", "national",
"max_rows", "min_rows", "national", "row",
}
for _, kw := range unreservedKws {
src := fmt.Sprintf("SELECT %s FROM tbl;", kw)