Merge pull request cockroachdb#16921 from elca-kairos-py/current_schema

sql/parser: Added current_schema keyword support.
benesch · Jul 8, 2017 · 3824cc1 · 3824cc1
2 parents 6ba72ad + a696032
commit 3824cc1
Show file tree

Hide file tree

Showing 5 changed files with 4,390 additions and 4,373 deletions.
diff --git a/pkg/sql/parser/keywords.go b/pkg/sql/parser/keywords.go
diff --git a/pkg/sql/parser/parse_test.go b/pkg/sql/parser/parse_test.go
@@ -805,6 +805,8 @@ func TestParse2(t *testing.T) {
 		{`SELECT a FROM t1 RIGHT OUTER JOIN t2 ON a = b`,
 			`SELECT a FROM t1 RIGHT JOIN t2 ON a = b`},
 		// Some functions are nearly keywords.
+		{`SELECT CURRENT_SCHEMA`,
+			`SELECT current_schema()`},
 		{`SELECT CURRENT_TIMESTAMP`,
 			`SELECT current_timestamp()`},
 		{`SELECT CURRENT_DATE`,

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