Merge pull request #22828 from knz/20180220-pg-compat

sql: additional pg compatibility functions
cockroachdb · Feb 20, 2018 · b98b8a7 · b98b8a7
2 parents 5d8a93e + 2f22fca
commit b98b8a7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/docs/generated/sql/bnf/stmt_block.bnf b/docs/generated/sql/bnf/stmt_block.bnf
@@ -1766,8 +1766,10 @@ over_clause ::=
 func_expr_common_subexpr ::=
 	'CURRENT_DATE'
 	| 'CURRENT_SCHEMA'
+	| 'CURRENT_CATALOG'
 	| 'CURRENT_TIMESTAMP'
 	| 'CURRENT_USER'
+	| 'CURRENT_ROLE'
 	| 'SESSION_USER'
 	| 'USER'
 	| 'CAST' '(' a_expr 'AS' cast_target ')'

diff --git a/pkg/sql/parser/parse_test.go b/pkg/sql/parser/parse_test.go
@@ -1050,6 +1050,8 @@ func TestParse2(t *testing.T) {
 		// Some functions are nearly keywords.
 		{`SELECT CURRENT_SCHEMA`,
 			`SELECT current_schema()`},
+		{`SELECT CURRENT_CATALOG`,
+			`SELECT current_database()`},
 		{`SELECT CURRENT_TIMESTAMP`,
 			`SELECT current_timestamp()`},
 		{`SELECT CURRENT_DATE`,
@@ -1066,6 +1068,8 @@ func TestParse2(t *testing.T) {
 			`SELECT btrim(a, b)`},
 		{`SELECT CURRENT_USER`,
 			`SELECT current_user()`},
+		{`SELECT CURRENT_ROLE`,
+			`SELECT current_user()`},
 		{`SELECT SESSION_USER`,
 			`SELECT current_user()`},
 		{`SELECT USER`,

diff --git a/pkg/sql/parser/sql.y b/pkg/sql/parser/sql.y
@@ -6356,15 +6356,26 @@ func_expr_common_subexpr:
   {
     $$.val = &tree.FuncExpr{Func: tree.WrapFunction($1)}
   }
+// Special identifier current_catalog is equivalent to current_database().
+// https://www.postgresql.org/docs/10/static/functions-info.html
+| CURRENT_CATALOG
+  {
+    $$.val = &tree.FuncExpr{Func: tree.WrapFunction("current_database")}
+  }
 | CURRENT_TIMESTAMP
   {
     $$.val = &tree.FuncExpr{Func: tree.WrapFunction($1)}
   }
-| CURRENT_ROLE { return unimplemented(sqllex, "current role") }
 | CURRENT_USER
   {
     $$.val = &tree.FuncExpr{Func: tree.WrapFunction($1)}
   }
+// Special identifier current_role is equivalent to current_user.
+// https://www.postgresql.org/docs/10/static/functions-info.html
+| CURRENT_ROLE
+  {
+    $$.val = &tree.FuncExpr{Func: tree.WrapFunction("current_user")}
+  }
 | SESSION_USER
   {
     $$.val = &tree.FuncExpr{Func: tree.WrapFunction("current_user")}