Merge pull request #7069 from nvanbenschoten/nvanbenschoten/fixParsing

sql/parser: Add FAMILY as reserved keyword to avoid ambiguity
cockroachdb · Jun 6, 2016 · 17283ef · 17283ef
2 parents 7365734 + 39ce7de
commit 17283ef
Show file tree

Hide file tree

Showing 5 changed files with 2,323 additions and 2,265 deletions.
diff --git a/sql/parser/parse_test.go b/sql/parser/parse_test.go
@@ -868,6 +868,13 @@ ALTER INDEX a IF EXISTS RENAME TO b
 			`syntax error at or near "EOF"
 DROP INDEX a
             ^
+`,
+		},
+		{
+			`ALTER TABLE t RENAME COLUMN x TO family`,
+			`syntax error at or near "family"
+ALTER TABLE t RENAME COLUMN x TO family
+                                 ^
 `,
 		},
 	}

diff --git a/sql/parser/reserved_keywords.go b/sql/parser/reserved_keywords.go