diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 7588f636ed2..e110b47132d 100644
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -38,10 +38,10 @@ ALTER USER name [ [ WITH ] name RENAME TO new_name
-ALTER USER name SET configuration_parameter { TO | = } { value | DEFAULT }
-ALTER USER name SET configuration_parameter FROM CURRENT
-ALTER USER name RESET configuration_parameter
-ALTER USER name RESET ALL
+ALTER USER name [ IN DATABASE database_name ] SET configuration_parameter { TO | = } { value | DEFAULT }
+ALTER USER name [ IN DATABASE database_name ] SET configuration_parameter FROM CURRENT
+ALTER USER name [ IN DATABASE database_name ] RESET configuration_parameter
+ALTER USER name [ IN DATABASE database_name ] RESET ALL
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b1d41b20a59..4182f2fd711 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -1012,12 +1012,12 @@ AlterUserStmt:
AlterUserSetStmt:
- ALTER USER RoleId SetResetClause
+ ALTER USER RoleId opt_in_database SetResetClause
{
AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
n->role = $3;
- n->database = NULL;
- n->setstmt = $4;
+ n->database = $4;
+ n->setstmt = $5;
$$ = (Node *)n;
}
;