parser: mysql start transaction WITH CONSISTENT SNAPSHOT syntax (ping…

…cap#1703)
jackysp · Sep 8, 2016 · 9c75a19 · 9c75a19
1 parent 6b8e1cd
commit 9c75a19
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/parser/misc.go b/parser/misc.go
@@ -176,6 +176,7 @@ var tokenMap = map[string]int{
 	"CONNECTION":          connection,
 	"CONNECTION_ID":       connectionID,
 	"CONSTRAINT":          constraint,
+	"CONSISTENT":          consistent,
 	"CONVERT":             convert,
 	"COUNT":               count,
 	"CREATE":              create,
@@ -343,6 +344,7 @@ var tokenMap = map[string]int{
 	"SHOW":                show,
 	"SLEEP":               sleep,
 	"SIGNED":              signed,
+	"SNAPSHOT":            snapshot,
 	"SOME":                some,
 	"SPACE":               space,
 	"START":               start,
@@ -389,6 +391,7 @@ var tokenMap = map[string]int{
 	"WEEKOFYEAR":          weekofyear,
 	"WHEN":                when,
 	"WHERE":               where,
+	"WITH":                with,
 	"WRITE":               write,
 	"XOR":                 xor,
 	"YEARWEEK":            yearweek,

diff --git a/parser/parser.y b/parser/parser.y
@@ -48,6 +48,8 @@ import (
 	/*yy:token "%c"     */	identifier      "identifier"
 	/*yy:token "\"%c\"" */	stringLit       "string literal"
 
+	with		"WITH"
+
 	/* the following tokens belong to NotKeywordToken*/
 	abs		"ABS"
 	addDate		"ADDDATE"
@@ -138,6 +140,7 @@ import (
 	compressed	"COMPRESSED"
 	compression	"COMPRESSION"
 	connection 	"CONNECTION"
+	consistent	"CONSISTENT"
 	data 		"DATA"
 	dateType	"DATE"
 	datetimeType	"DATETIME"
@@ -185,6 +188,7 @@ import (
 	serializable	"SERIALIZABLE"
 	session		"SESSION"
 	signed		"SIGNED"
+	snapshot	"SNAPSHOT"
 	space 		"SPACE"
 	sqlCache	"SQL_CACHE"
 	sqlNoCache	"SQL_NO_CACHE"
@@ -882,6 +886,10 @@ BeginTransactionStmt:
 	{
 		$$ = &ast.BeginStmt{}
 	}
+|	"START" "TRANSACTION" "WITH" "CONSISTENT" "SNAPSHOT"
+	{
+		$$ = &ast.BeginStmt{}
+	}
 
 BinlogStmt:
 	"BINLOG" stringLit
@@ -1945,13 +1953,13 @@ identifier | UnReservedKeyword | NotKeywordToken
 
 UnReservedKeyword:
  "ACTION" | "ASCII" | "AUTO_INCREMENT" | "AFTER" | "AVG" | "BEGIN" | "BIT" | "BOOL" | "BOOLEAN" | "BTREE" | "CHARSET"
-|	"COLUMNS" | "COMMIT" | "COMPACT" | "COMPRESSED" | "DATA" | "DATE" | "DATETIME" | "DEALLOCATE" | "DO" | "DYNAMIC"
-|	"END" | "ENGINE" | "ENGINES" | "ESCAPE" | "EXECUTE" | "FIELDS" | "FIRST" | "FIXED" | "FULL" | "HASH" | "LOCAL"
-|	"NAMES" | "OFFSET" | "PASSWORD" %prec lowerThanEq | "PREPARE" | "QUICK" | "REDUNDANT" | "ROLLBACK" | "SESSION"
-|	"SIGNED" | "START" | "STATUS" | "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" | "ROW" | "ROW_FORMAT" | "QUARTER" | "GRANTS" | "TRIGGERS" | "DELAY_KEY_WRITE" | "ISOLATION"
+|	"COLUMNS" | "COMMIT" | "COMPACT" | "COMPRESSED" | "CONSISTENT" | "DATA" | "DATE" | "DATETIME" | "DEALLOCATE" | "DO"
+|	"DYNAMIC"| "END" | "ENGINE" | "ENGINES" | "ESCAPE" | "EXECUTE" | "FIELDS" | "FIRST" | "FIXED" | "FULL" |"GLOBAL"
+|	"HASH" | "LOCAL" | "NAMES" | "OFFSET" | "PASSWORD" %prec lowerThanEq | "PREPARE" | "QUICK" | "REDUNDANT" | "ROLLBACK"
+|	"SESSION" | "SIGNED" | "SNAPSHOT" | "START" | "STATUS" | "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" | "ROW" | "ROW_FORMAT" | "QUARTER" | "GRANTS" | "TRIGGERS" | "DELAY_KEY_WRITE" | "ISOLATION"
 |	"REPEATABLE" | "COMMITTED" | "UNCOMMITTED" | "ONLY" | "SERIALIZABLE" | "LEVEL" | "VARIABLES" | "SQL_CACHE"
 |	"SQL_NO_CACHE" | "DISABLE"  | "ENABLE" | "REVERSE" | "SPACE" | "PRIVILEGES" | "NO" | "BINLOG"
 

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -919,6 +919,7 @@ func (s *testParserSuite) TestComment(c *C) {
 		{"create table t (c int) comment 'comment'", true},
 		{"create table t (c int) comment comment", false},
 		{"create table t (comment text)", true},
+		{"START TRANSACTION /*!40108 WITH CONSISTENT SNAPSHOT */", true},
 		// For comment in query
 		{"/*comment*/ /*comment*/ select c /* this is a comment */ from t;", true},
 	}