From 2a5f7b6912a3f5ae61f7bd68033eedcf5f48ee57 Mon Sep 17 00:00:00 2001 From: siddontang Date: Thu, 8 Oct 2015 17:22:32 +0800 Subject: [PATCH] parser: row is an unserved key word --- parser/parser.y | 2 +- parser/parser_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parser/parser.y b/parser/parser.y index 506932834f..26e292374e 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -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" diff --git a/parser/parser_test.go b/parser/parser_test.go index 08881b1f9d..0b3ed915e3 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -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)