Merge #24864

24864: cherry-pick 2.0: sql: unreserve the STORED keyword r=knz a=knz Picks #24554. cc @cockroachdb/release Co-authored-by: Jordan Lewis <[email protected]>
cockroachdb · Apr 17, 2018 · 482ab05 · 482ab05
2 parents ff9c5a0 + 58cd6bd
commit 482ab05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/generated/sql/bnf/stmt_block.bnf b/docs/generated/sql/bnf/stmt_block.bnf
@@ -778,6 +778,7 @@ unreserved_keyword ::=
 	| 'STATISTICS'
 	| 'STDIN'
 	| 'STORE'
+	| 'STORED'
 	| 'STORING'
 	| 'STRICT'
 	| 'SPLIT'
@@ -1496,7 +1497,6 @@ reserved_keyword ::=
 	| 'SELECT'
 	| 'SESSION_USER'
 	| 'SOME'
-	| 'STORED'
 	| 'SYMMETRIC'
 	| 'TABLE'
 	| 'THEN'

diff --git a/pkg/sql/parser/sql.y b/pkg/sql/parser/sql.y
@@ -7776,6 +7776,7 @@ unreserved_keyword:
 | STATISTICS
 | STDIN
 | STORE
+| STORED
 | STORING
 | STRICT
 | SPLIT
@@ -7987,7 +7988,6 @@ reserved_keyword:
 | SELECT
 | SESSION_USER
 | SOME
-| STORED
 | SYMMETRIC
 | TABLE
 | THEN