From: Peter Eisentraut <peter.eisentraut@2ndquadrant.com>
To: pgsql-hackers <pgsql-hackers@postgresql.org>
Cc: Alvaro Herrera <alvherre@2ndquadrant.com>
Subject: Re: Allow CURRENT_ROLE in GRANTED BY
Date: Wed, 26 Aug 2020 13:00:57 +0200
Message-ID: <cc12f3fc-9fb1-71dc-1b51-1edf65f9e5c2@2ndquadrant.com> (raw)
In-Reply-To: <13369949-9e86-9214-8952-a74befaea41d@2ndquadrant.com>
References: <20200624210831.GA7173@alvherre.pgsql>
<13369949-9e86-9214-8952-a74befaea41d@2ndquadrant.com>
On 2020-06-29 14:47, Peter Eisentraut wrote:
> On 2020-06-24 23:08, Alvaro Herrera wrote:
>> On 2020-Jun-24, Peter Eisentraut wrote:
>>
>>> I was checking some loose ends in SQL conformance, when I noticed: We
>>> support GRANT role ... GRANTED BY CURRENT_USER, but we don't support
>>> CURRENT_ROLE in that place, even though in PostgreSQL they are equivalent.
>>> Here is a trivial patch to add that.
>>
>> Hmm, since this adds to RoleSpec, this change makes every place that
>> uses that production also take CURRENT_ROLE, so we'd need to document in
>> all those places. For example, alter_role.sgml, create_schema.sgml,
>> etc.
>
> Good point. Here is an updated patch that updates all the documentation
> places where CURRENT_USER is mentioned.
Here is another patch that also makes comprehensive updates to the
rolenames tests under src/test/modules/unsafe_tests/.
I think this should now cover all the required ancillary changes.
--
Peter Eisentraut http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
Attachments:v3-0001-Allow-CURRENT_ROLE-where-CURRENT_USER-is-accepted.patch (text/plain, 114.1K) download
From 5038b835a5233bac2bd3a17dd4d9406e045661c2 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Wed, 26 Aug 2020 08:14:46 +0200
Subject: [PATCH v3] Allow CURRENT_ROLE where CURRENT_USER is accepted
In the particular case of GRANTED BY, this is specified in the SQL
standard. Since in PostgreSQL, CURRENT_ROLE is equivalent to
CURRENT_USER, and CURRENT_USER is already supported here, adding
CURRENT_ROLE is trivial. The other cases are PostgreSQL extensions,
but for the same reason it also makes sense there.
Reviewed-by: Vik Fearing <vik@postgresfriends.org>
Discussion: https://www.postgresql.org/message-id/flat/f2feac44-b4c5-f38f-3699-2851d6a76dc9%402ndquadrant.com
---
doc/src/sgml/ref/alter_aggregate.sgml | 2 +-
doc/src/sgml/ref/alter_collation.sgml | 2 +-
doc/src/sgml/ref/alter_conversion.sgml | 2 +-
doc/src/sgml/ref/alter_database.sgml | 2 +-
doc/src/sgml/ref/alter_domain.sgml | 2 +-
doc/src/sgml/ref/alter_event_trigger.sgml | 2 +-
.../sgml/ref/alter_foreign_data_wrapper.sgml | 2 +-
doc/src/sgml/ref/alter_foreign_table.sgml | 2 +-
doc/src/sgml/ref/alter_function.sgml | 2 +-
doc/src/sgml/ref/alter_group.sgml | 1 +
doc/src/sgml/ref/alter_language.sgml | 2 +-
doc/src/sgml/ref/alter_large_object.sgml | 2 +-
doc/src/sgml/ref/alter_materialized_view.sgml | 2 +-
doc/src/sgml/ref/alter_opclass.sgml | 2 +-
doc/src/sgml/ref/alter_operator.sgml | 2 +-
doc/src/sgml/ref/alter_opfamily.sgml | 2 +-
doc/src/sgml/ref/alter_policy.sgml | 2 +-
doc/src/sgml/ref/alter_procedure.sgml | 2 +-
doc/src/sgml/ref/alter_publication.sgml | 2 +-
doc/src/sgml/ref/alter_role.sgml | 2 +
doc/src/sgml/ref/alter_routine.sgml | 2 +-
doc/src/sgml/ref/alter_schema.sgml | 2 +-
doc/src/sgml/ref/alter_sequence.sgml | 2 +-
doc/src/sgml/ref/alter_server.sgml | 2 +-
doc/src/sgml/ref/alter_statistics.sgml | 2 +-
doc/src/sgml/ref/alter_subscription.sgml | 2 +-
doc/src/sgml/ref/alter_table.sgml | 2 +-
doc/src/sgml/ref/alter_tablespace.sgml | 2 +-
doc/src/sgml/ref/alter_tsconfig.sgml | 2 +-
doc/src/sgml/ref/alter_tsdictionary.sgml | 2 +-
doc/src/sgml/ref/alter_type.sgml | 2 +-
doc/src/sgml/ref/alter_user.sgml | 1 +
doc/src/sgml/ref/alter_user_mapping.sgml | 4 +-
doc/src/sgml/ref/alter_view.sgml | 2 +-
doc/src/sgml/ref/create_policy.sgml | 2 +-
doc/src/sgml/ref/create_schema.sgml | 1 +
doc/src/sgml/ref/create_tablespace.sgml | 2 +-
doc/src/sgml/ref/create_user_mapping.sgml | 4 +-
doc/src/sgml/ref/drop_owned.sgml | 2 +-
doc/src/sgml/ref/drop_user_mapping.sgml | 4 +-
doc/src/sgml/ref/grant.sgml | 1 +
doc/src/sgml/ref/reassign_owned.sgml | 4 +-
doc/src/sgml/ref/revoke.sgml | 1 +
src/backend/parser/gram.y | 11 +
src/backend/utils/adt/acl.c | 2 +
src/include/nodes/parsenodes.h | 1 +
.../unsafe_tests/expected/rolenames.out | 618 ++++++++++--------
.../modules/unsafe_tests/sql/rolenames.sql | 221 ++++---
48 files changed, 530 insertions(+), 412 deletions(-)
diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgmlindex 2ad3e0440b..95934a100f 100644--- a/doc/src/sgml/ref/alter_aggregate.sgml+++ b/doc/src/sgml/ref/alter_aggregate.sgml@@ -23,7 +23,7 @@
<synopsis>
ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) RENAME TO <replaceable>new_name</replaceable>
ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signature</replaceable> )
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) SET SCHEMA <replaceable>new_schema</replaceable>
<phrase>where <replaceable>aggregate_signature</replaceable> is:</phrase>
diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgmlindex bee6f0dd3c..af9ff2867b 100644--- a/doc/src/sgml/ref/alter_collation.sgml+++ b/doc/src/sgml/ref/alter_collation.sgml@@ -24,7 +24,7 @@
ALTER COLLATION <replaceable>name</replaceable> REFRESH VERSION
ALTER COLLATION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER COLLATION <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER COLLATION <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_schema</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgmlindex c42bd8b3e4..a128f20f3e 100644--- a/doc/src/sgml/ref/alter_conversion.sgml+++ b/doc/src/sgml/ref/alter_conversion.sgml@@ -22,7 +22,7 @@
<refsynopsisdiv>
<synopsis>
ALTER CONVERSION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER CONVERSION <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER CONVERSION <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER CONVERSION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_schema</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgmlindex 7db878cf53..81e37536a3 100644--- a/doc/src/sgml/ref/alter_database.sgml+++ b/doc/src/sgml/ref/alter_database.sgml@@ -31,7 +31,7 @@
ALTER DATABASE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER DATABASE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER DATABASE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER DATABASE <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable>
diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgmlindex 8201cbb65f..afa42b4926 100644--- a/doc/src/sgml/ref/alter_domain.sgml+++ b/doc/src/sgml/ref/alter_domain.sgml@@ -36,7 +36,7 @@
ALTER DOMAIN <replaceable class="parameter">name</replaceable>
VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable>
ALTER DOMAIN <replaceable class="parameter">name</replaceable>
- OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER DOMAIN <replaceable class="parameter">name</replaceable>
RENAME TO <replaceable class="parameter">new_name</replaceable>
ALTER DOMAIN <replaceable class="parameter">name</replaceable>
diff --git a/doc/src/sgml/ref/alter_event_trigger.sgml b/doc/src/sgml/ref/alter_event_trigger.sgmlindex 61919f7845..ef5253bf37 100644--- a/doc/src/sgml/ref/alter_event_trigger.sgml+++ b/doc/src/sgml/ref/alter_event_trigger.sgml@@ -23,7 +23,7 @@
<synopsis>
ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> DISABLE
ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> ENABLE [ REPLICA | ALWAYS ]
-ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgmlindex 14f3d616e7..54f34c2c01 100644--- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml+++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml@@ -25,7 +25,7 @@
[ HANDLER <replaceable class="parameter">handler_function</replaceable> | NO HANDLER ]
[ VALIDATOR <replaceable class="parameter">validator_function</replaceable> | NO VALIDATOR ]
[ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ]) ]
-ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgmlindex 0f11897c99..04d53628ec 100644--- a/doc/src/sgml/ref/alter_foreign_table.sgml+++ b/doc/src/sgml/ref/alter_foreign_table.sgml@@ -53,7 +53,7 @@
SET WITHOUT OIDS
INHERIT <replaceable class="parameter">parent_table</replaceable>
NO INHERIT <replaceable class="parameter">parent_table</replaceable>
- OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ])
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgmlindex 70b1f24bc0..54e61e7d78 100644--- a/doc/src/sgml/ref/alter_function.sgml+++ b/doc/src/sgml/ref/alter_function.sgml@@ -26,7 +26,7 @@
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
RENAME TO <replaceable>new_name</replaceable>
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
SET SCHEMA <replaceable>new_schema</replaceable>
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgmlindex 39cc2b88cf..f6e5163109 100644--- a/doc/src/sgml/ref/alter_group.sgml+++ b/doc/src/sgml/ref/alter_group.sgml@@ -27,6 +27,7 @@
<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
<replaceable class="parameter">role_name</replaceable>
+ | CURRENT_ROLE
| CURRENT_USER
| SESSION_USER
diff --git a/doc/src/sgml/ref/alter_language.sgml b/doc/src/sgml/ref/alter_language.sgmlindex eac63dec13..0b61c18aee 100644--- a/doc/src/sgml/ref/alter_language.sgml+++ b/doc/src/sgml/ref/alter_language.sgml@@ -22,7 +22,7 @@
<refsynopsisdiv>
<synopsis>
ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_large_object.sgml b/doc/src/sgml/ref/alter_large_object.sgmlindex 356f8a8eab..17ea1491ba 100644--- a/doc/src/sgml/ref/alter_large_object.sgml+++ b/doc/src/sgml/ref/alter_large_object.sgml@@ -21,7 +21,7 @@
<refsynopsisdiv>
<synopsis>
-ALTER LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_materialized_view.sgml b/doc/src/sgml/ref/alter_materialized_view.sgmlindex 7321183dd0..78ee99bb9c 100644--- a/doc/src/sgml/ref/alter_materialized_view.sgml+++ b/doc/src/sgml/ref/alter_materialized_view.sgml@@ -44,7 +44,7 @@
SET WITHOUT CLUSTER
SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
- OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_opclass.sgml b/doc/src/sgml/ref/alter_opclass.sgmlindex 59a64caa4f..b1db459b11 100644--- a/doc/src/sgml/ref/alter_opclass.sgml+++ b/doc/src/sgml/ref/alter_opclass.sgml@@ -25,7 +25,7 @@
RENAME TO <replaceable>new_name</replaceable>
ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable>
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable>
SET SCHEMA <replaceable>new_schema</replaceable>
diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgmlindex b3bfa9ccbe..ac35f229a0 100644--- a/doc/src/sgml/ref/alter_operator.sgml+++ b/doc/src/sgml/ref/alter_operator.sgml@@ -22,7 +22,7 @@
<refsynopsisdiv>
<synopsis>
ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</replaceable> | NONE } , { <replaceable>right_type</replaceable> | NONE } )
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</replaceable> | NONE } , { <replaceable>right_type</replaceable> | NONE } )
SET SCHEMA <replaceable>new_schema</replaceable>
diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgmlindex 4ac1cca95a..59d5bf1070 100644--- a/doc/src/sgml/ref/alter_opfamily.sgml+++ b/doc/src/sgml/ref/alter_opfamily.sgml@@ -37,7 +37,7 @@
RENAME TO <replaceable>new_name</replaceable>
ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable>
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable>
SET SCHEMA <replaceable>new_schema</replaceable>
diff --git a/doc/src/sgml/ref/alter_policy.sgml b/doc/src/sgml/ref/alter_policy.sgmlindex a1c720a956..1c38324b59 100644--- a/doc/src/sgml/ref/alter_policy.sgml+++ b/doc/src/sgml/ref/alter_policy.sgml@@ -24,7 +24,7 @@
ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable>
- [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER } [, ...] ]+ [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_ROLE | CURRENT_USER | SESSION_USER } [, ...] ]
[ USING ( <replaceable class="parameter">using_expression</replaceable> ) ]
[ WITH CHECK ( <replaceable class="parameter">check_expression</replaceable> ) ]
</synopsis>
diff --git a/doc/src/sgml/ref/alter_procedure.sgml b/doc/src/sgml/ref/alter_procedure.sgmlindex dae80076d9..bcf45c7a85 100644--- a/doc/src/sgml/ref/alter_procedure.sgml+++ b/doc/src/sgml/ref/alter_procedure.sgml@@ -26,7 +26,7 @@
ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
RENAME TO <replaceable>new_name</replaceable>
ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
SET SCHEMA <replaceable>new_schema</replaceable>
ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgmlindex 534e598d93..c2946dfe0f 100644--- a/doc/src/sgml/ref/alter_publication.sgml+++ b/doc/src/sgml/ref/alter_publication.sgml@@ -25,7 +25,7 @@
ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...]
ALTER PUBLICATION <replaceable class="parameter">name</replaceable> DROP TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...]
ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">publication_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
-ALTER PUBLICATION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgmlindex dbf258ef50..d5f166c129 100644--- a/doc/src/sgml/ref/alter_role.sgml+++ b/doc/src/sgml/ref/alter_role.sgml@@ -46,6 +46,7 @@
<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
<replaceable class="parameter">role_name</replaceable>
+ | CURRENT_ROLE
| CURRENT_USER
| SESSION_USER
</synopsis>
@@ -134,6 +135,7 @@ <title>Parameters</title>
</varlistentry>
<varlistentry>
+ <term><literal>CURRENT_ROLE</literal></term>
<term><literal>CURRENT_USER</literal></term>
<listitem>
<para>
diff --git a/doc/src/sgml/ref/alter_routine.sgml b/doc/src/sgml/ref/alter_routine.sgmlindex d1699691e1..36acaff319 100644--- a/doc/src/sgml/ref/alter_routine.sgml+++ b/doc/src/sgml/ref/alter_routine.sgml@@ -26,7 +26,7 @@
ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
RENAME TO <replaceable>new_name</replaceable>
ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
- OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
SET SCHEMA <replaceable>new_schema</replaceable>
ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
diff --git a/doc/src/sgml/ref/alter_schema.sgml b/doc/src/sgml/ref/alter_schema.sgmlindex 2937214026..04624c5a5e 100644--- a/doc/src/sgml/ref/alter_schema.sgml+++ b/doc/src/sgml/ref/alter_schema.sgml@@ -22,7 +22,7 @@
<refsynopsisdiv>
<synopsis>
ALTER SCHEMA <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER SCHEMA <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER SCHEMA <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgmlindex bfd20af6d3..3cd9ece49f 100644--- a/doc/src/sgml/ref/alter_sequence.sgml+++ b/doc/src/sgml/ref/alter_sequence.sgml@@ -31,7 +31,7 @@
[ RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] ]
[ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
[ OWNED BY { <replaceable class="parameter">table_name</replaceable>.<replaceable class="parameter">column_name</replaceable> | NONE } ]
-ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
</synopsis>
diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgmlindex 17e55b093e..186f38b5f8 100644--- a/doc/src/sgml/ref/alter_server.sgml+++ b/doc/src/sgml/ref/alter_server.sgml@@ -23,7 +23,7 @@
<synopsis>
ALTER SERVER <replaceable class="parameter">name</replaceable> [ VERSION '<replaceable class="parameter">new_version</replaceable>' ]
[ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] ) ]
-ALTER SERVER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER SERVER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER SERVER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_statistics.sgml b/doc/src/sgml/ref/alter_statistics.sgmlindex be4c3f1f05..112f5d8924 100644--- a/doc/src/sgml/ref/alter_statistics.sgml+++ b/doc/src/sgml/ref/alter_statistics.sgml@@ -23,7 +23,7 @@
<refsynopsisdiv>
<synopsis>
-ALTER STATISTICS <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER STATISTICS <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER STATISTICS <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET STATISTICS <replaceable class="parameter">new_target</replaceable>
diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgmlindex 81c4e70cdf..36c065c32c 100644--- a/doc/src/sgml/ref/alter_subscription.sgml+++ b/doc/src/sgml/ref/alter_subscription.sgml@@ -27,7 +27,7 @@
ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> ENABLE
ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> DISABLE
ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
-ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgmlindex b2eb7097a9..eec4a3ae2f 100644--- a/doc/src/sgml/ref/alter_table.sgml+++ b/doc/src/sgml/ref/alter_table.sgml@@ -82,7 +82,7 @@
NO INHERIT <replaceable class="parameter">parent_table</replaceable>
OF <replaceable class="parameter">type_name</replaceable>
NOT OF
- OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
REPLICA IDENTITY { DEFAULT | USING INDEX <replaceable class="parameter">index_name</replaceable> | FULL | NOTHING }
<phrase>and <replaceable class="parameter">partition_bound_spec</replaceable> is:</phrase>
diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgmlindex 356fb9f93f..6de80746d5 100644--- a/doc/src/sgml/ref/alter_tablespace.sgml+++ b/doc/src/sgml/ref/alter_tablespace.sgml@@ -22,7 +22,7 @@
<refsynopsisdiv>
<synopsis>
ALTER TABLESPACE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER TABLESPACE <replaceable>name</replaceable> SET ( <replaceable class="parameter">tablespace_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
ALTER TABLESPACE <replaceable>name</replaceable> RESET ( <replaceable class="parameter">tablespace_option</replaceable> [, ... ] )
</synopsis>
diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgmlindex ebe0b94b27..8fafcd3bbd 100644--- a/doc/src/sgml/ref/alter_tsconfig.sgml+++ b/doc/src/sgml/ref/alter_tsconfig.sgml@@ -32,7 +32,7 @@
ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
DROP MAPPING [ IF EXISTS ] FOR <replaceable class="parameter">token_type</replaceable> [, ... ]
ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_schema</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgmlindex b29865e11e..d1923ef160 100644--- a/doc/src/sgml/ref/alter_tsdictionary.sgml+++ b/doc/src/sgml/ref/alter_tsdictionary.sgml@@ -25,7 +25,7 @@
<replaceable class="parameter">option</replaceable> [ = <replaceable class="parameter">value</replaceable> ] [, ... ]
)
ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
-ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> SET SCHEMA <replaceable>new_schema</replaceable>
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgmlindex f015fcd268..a4f09c660b 100644--- a/doc/src/sgml/ref/alter_type.sgml+++ b/doc/src/sgml/ref/alter_type.sgml@@ -23,7 +23,7 @@
<refsynopsisdiv>
<synopsis>
-ALTER TYPE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER TYPE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
ALTER TYPE <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> TO <replaceable class="parameter">new_attribute_name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgmlindex 6769c8ecc4..51527cefb4 100644--- a/doc/src/sgml/ref/alter_user.sgml+++ b/doc/src/sgml/ref/alter_user.sgml@@ -46,6 +46,7 @@
<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
<replaceable class="parameter">role_name</replaceable>
+ | CURRENT_ROLE
| CURRENT_USER
| SESSION_USER
</synopsis>
diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgmlindex 7a9b5a188a..ee5aee9bc9 100644--- a/doc/src/sgml/ref/alter_user_mapping.sgml+++ b/doc/src/sgml/ref/alter_user_mapping.sgml@@ -21,7 +21,7 @@
<refsynopsisdiv>
<synopsis>
-ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | SESSION_USER | PUBLIC }+ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_ROLE | CURRENT_USER | SESSION_USER | PUBLIC }
SERVER <replaceable class="parameter">server_name</replaceable>
OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )
</synopsis>
@@ -51,7 +51,7 @@ <title>Parameters</title>
<term><replaceable class="parameter">user_name</replaceable></term>
<listitem>
<para>
- User name of the mapping. <literal>CURRENT_USER</literal>+ User name of the mapping. <literal>CURRENT_ROLE</literal>, <literal>CURRENT_USER</literal>,
and <literal>USER</literal> match the name of the current
user. <literal>PUBLIC</literal> is used to match all present and future
user names in the system.
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgmlindex e8d9e11e0f..98c312c5bf 100644--- a/doc/src/sgml/ref/alter_view.sgml+++ b/doc/src/sgml/ref/alter_view.sgml@@ -23,7 +23,7 @@
<synopsis>
ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable>
ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT
-ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }+ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable>
ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
diff --git a/doc/src/sgml/ref/create_policy.sgml b/doc/src/sgml/ref/create_policy.sgmlindex 2e1229c4f9..b4f9056101 100644--- a/doc/src/sgml/ref/create_policy.sgml+++ b/doc/src/sgml/ref/create_policy.sgml@@ -24,7 +24,7 @@
CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable>
[ AS { PERMISSIVE | RESTRICTIVE } ]
[ FOR { ALL | SELECT | INSERT | UPDATE | DELETE } ]
- [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER } [, ...] ]+ [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_ROLE | CURRENT_USER | SESSION_USER } [, ...] ]
[ USING ( <replaceable class="parameter">using_expression</replaceable> ) ]
[ WITH CHECK ( <replaceable class="parameter">check_expression</replaceable> ) ]
</synopsis>
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgmlindex ffbe1ba3bc..3c2dddb163 100644--- a/doc/src/sgml/ref/create_schema.sgml+++ b/doc/src/sgml/ref/create_schema.sgml@@ -29,6 +29,7 @@
<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
<replaceable class="parameter">user_name</replaceable>
+ | CURRENT_ROLE
| CURRENT_USER
| SESSION_USER
</synopsis>
diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgmlindex 462b8831c2..84fa7ee5e2 100644--- a/doc/src/sgml/ref/create_tablespace.sgml+++ b/doc/src/sgml/ref/create_tablespace.sgml@@ -22,7 +22,7 @@
<refsynopsisdiv>
<synopsis>
CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
- [ OWNER { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } ]+ [ OWNER { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER } ]
LOCATION '<replaceable class="parameter">directory</replaceable>'
[ WITH ( <replaceable class="parameter">tablespace_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) ]
</synopsis>
diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgmlindex 9719a4ff2c..55debd5401 100644--- a/doc/src/sgml/ref/create_user_mapping.sgml+++ b/doc/src/sgml/ref/create_user_mapping.sgml@@ -21,7 +21,7 @@
<refsynopsisdiv>
<synopsis>
-CREATE USER MAPPING [ IF NOT EXISTS ] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC }+CREATE USER MAPPING [ IF NOT EXISTS ] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_ROLE | CURRENT_USER | PUBLIC }
SERVER <replaceable class="parameter">server_name</replaceable>
[ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [ , ... ] ) ]
</synopsis>
@@ -67,7 +67,7 @@ <title>Parameters</title>
<listitem>
<para>
The name of an existing user that is mapped to foreign server.
- <literal>CURRENT_USER</literal> and <literal>USER</literal> match the name of+ <literal>CURRENT_ROLE</literal>, <literal>CURRENT_USER</literal>, and <literal>USER</literal> match the name of
the current user. When <literal>PUBLIC</literal> is specified, a
so-called public mapping is created that is used when no
user-specific mapping is applicable.
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgmlindex 09107bef64..dcc375f33b 100644--- a/doc/src/sgml/ref/drop_owned.sgml+++ b/doc/src/sgml/ref/drop_owned.sgml@@ -21,7 +21,7 @@
<refsynopsisdiv>
<synopsis>
-DROP OWNED BY { <replaceable class="parameter">name</replaceable> | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ]+DROP OWNED BY { <replaceable class="parameter">name</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ]
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgmlindex 7cb09f1166..9e8896a307 100644--- a/doc/src/sgml/ref/drop_user_mapping.sgml+++ b/doc/src/sgml/ref/drop_user_mapping.sgml@@ -21,7 +21,7 @@
<refsynopsisdiv>
<synopsis>
-DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC } SERVER <replaceable class="parameter">server_name</replaceable>+DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_ROLE | CURRENT_USER | PUBLIC } SERVER <replaceable class="parameter">server_name</replaceable>
</synopsis>
</refsynopsisdiv>
@@ -59,7 +59,7 @@ <title>Parameters</title>
<term><replaceable class="parameter">user_name</replaceable></term>
<listitem>
<para>
- User name of the mapping. <literal>CURRENT_USER</literal>+ User name of the mapping. <literal>CURRENT_ROLE</literal>, <literal>CURRENT_USER</literal>,
and <literal>USER</literal> match the name of the current
user. <literal>PUBLIC</literal> is used to match all present and
future user names in the system.
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgmlindex bc573f7826..fe231aa30c 100644--- a/doc/src/sgml/ref/grant.sgml+++ b/doc/src/sgml/ref/grant.sgml@@ -87,6 +87,7 @@
[ GROUP ] <replaceable class="parameter">role_name</replaceable>
| PUBLIC
+ | CURRENT_ROLE
| CURRENT_USER
| SESSION_USER
</synopsis>
diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgmlindex 42f72a726f..783389df4e 100644--- a/doc/src/sgml/ref/reassign_owned.sgml+++ b/doc/src/sgml/ref/reassign_owned.sgml@@ -21,8 +21,8 @@
<refsynopsisdiv>
<synopsis>
-REASSIGN OWNED BY { <replaceable class="parameter">old_role</replaceable> | CURRENT_USER | SESSION_USER } [, ...]- TO { <replaceable class="parameter">new_role</replaceable> | CURRENT_USER | SESSION_USER }+REASSIGN OWNED BY { <replaceable class="parameter">old_role</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER } [, ...]+ TO { <replaceable class="parameter">new_role</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
</synopsis>
</refsynopsisdiv>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgmlindex b6bac21c57..b50f99dfe7 100644--- a/doc/src/sgml/ref/revoke.sgml+++ b/doc/src/sgml/ref/revoke.sgml@@ -114,6 +114,7 @@
[ GROUP ] <replaceable class="parameter">role_name</replaceable>
| PUBLIC
+ | CURRENT_ROLE
| CURRENT_USER
| SESSION_USER
</synopsis>
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.yindex dbb47d4982..c7f95170a2 100644--- a/src/backend/parser/gram.y+++ b/src/backend/parser/gram.y@@ -14915,6 +14915,13 @@ RoleId: RoleSpec
"CURRENT_USER"),
parser_errposition(@1)));
break;
+ case ROLESPEC_CURRENT_ROLE:+ ereport(ERROR,+ (errcode(ERRCODE_RESERVED_NAME),+ errmsg("%s cannot be used as a role name here",+ "CURRENT_ROLE"),+ parser_errposition(@1)));+ break;
}
}
;
@@ -14946,6 +14953,10 @@ RoleSpec: NonReservedWord
}
$$ = n;
}
+ | CURRENT_ROLE+ {+ $$ = makeRoleSpec(ROLESPEC_CURRENT_ROLE, @1);+ }
| CURRENT_USER
{
$$ = makeRoleSpec(ROLESPEC_CURRENT_USER, @1);
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.cindex de3f49637e..f97489f064 100644--- a/src/backend/utils/adt/acl.c+++ b/src/backend/utils/adt/acl.c@@ -5217,6 +5217,7 @@ get_rolespec_oid(const RoleSpec *role, bool missing_ok)
oid = get_role_oid(role->rolename, missing_ok);
break;
+ case ROLESPEC_CURRENT_ROLE:
case ROLESPEC_CURRENT_USER:
oid = GetUserId();
break;
@@ -5259,6 +5260,7 @@ get_rolespec_tuple(const RoleSpec *role)
errmsg("role \"%s\" does not exist", role->rolename)));
break;
+ case ROLESPEC_CURRENT_ROLE:
case ROLESPEC_CURRENT_USER:
tuple = SearchSysCache1(AUTHOID, GetUserId());
if (!HeapTupleIsValid(tuple))
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.hindex 47d4c07306..9b49cbe0d3 100644--- a/src/include/nodes/parsenodes.h+++ b/src/include/nodes/parsenodes.h@@ -318,6 +318,7 @@ typedef struct CollateClause
typedef enum RoleSpecType
{
ROLESPEC_CSTRING, /* role name is stored as a C string */
+ ROLESPEC_CURRENT_ROLE, /* role spec is CURRENT_ROLE */
ROLESPEC_CURRENT_USER, /* role spec is CURRENT_USER */
ROLESPEC_SESSION_USER, /* role spec is SESSION_USER */
ROLESPEC_PUBLIC /* role name is "public" */
diff --git a/src/test/modules/unsafe_tests/expected/rolenames.out b/src/test/modules/unsafe_tests/expected/rolenames.outindex ff6aa69fc0..fff55a67c4 100644--- a/src/test/modules/unsafe_tests/expected/rolenames.out+++ b/src/test/modules/unsafe_tests/expected/rolenames.out@@ -3,8 +3,10 @@ CREATE OR REPLACE FUNCTION chkrolattr()
AS $$
SELECT r.rolname, v.keyword, r.rolcanlogin, r.rolreplication
FROM pg_roles r
- JOIN (VALUES(CURRENT_USER, 'current_user'),+ JOIN (VALUES(CURRENT_ROLE, 'current_role'),+ (CURRENT_USER, 'current_user'),
(SESSION_USER, 'session_user'),
+ ('current_role', '-'),
('current_user', '-'),
('session_user', '-'),
('Public', '-'),
@@ -21,8 +23,9 @@ SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),
FROM pg_db_role_setting s
LEFT JOIN pg_roles r ON (r.oid = s.setrole)
LEFT JOIN pg_database d ON (d.oid = s.setdatabase)
- LEFT JOIN (VALUES(CURRENT_USER, 'current_user'),- (SESSION_USER, 'session_user'))+ LEFT JOIN (VALUES(CURRENT_ROLE, 'current_role'),+ (CURRENT_USER, 'current_user'),+ (SESSION_USER, 'session_user'))
AS v(uname, keyword)
ON (r.rolname = v.uname)
WHERE (r.rolname) IN ('Public', 'current_user', 'regress_testrol1', 'regress_testrol2')
@@ -46,6 +49,7 @@ $$ LANGUAGE SQL;
SET client_min_messages = ERROR;
CREATE ROLE "Public";
CREATE ROLE "None";
+CREATE ROLE "current_role";
CREATE ROLE "current_user";
CREATE ROLE "session_user";
CREATE ROLE "user";
@@ -55,7 +59,7 @@ ERROR: CURRENT_USER cannot be used as a role name here
LINE 1: CREATE ROLE current_user;
^
CREATE ROLE current_role; -- error
-ERROR: syntax error at or near "current_role"+ERROR: CURRENT_ROLE cannot be used as a role name here
LINE 1: CREATE ROLE current_role;
^
CREATE ROLE session_user; -- error
@@ -112,23 +116,56 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | f
current_user | - | f | f
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | f
regress_testrol2 | current_user | f | f
session_user | - | f | f
-(6 rows)+(8 rows)++ALTER ROLE CURRENT_ROLE WITH REPLICATION;+SELECT * FROM chkrolattr();+ role | rolekeyword | canlogin | replication +------------------+--------------+----------+-------------+ None | - | f | f+ Public | - | f | f+ current_role | - | f | f+ current_user | - | f | f+ regress_testrol1 | session_user | t | f+ regress_testrol2 | current_role | f | t+ regress_testrol2 | current_user | f | t+ session_user | - | f | f+(8 rows)+ALTER ROLE "current_role" WITH REPLICATION;+SELECT * FROM chkrolattr();+ role | rolekeyword | canlogin | replication +------------------+--------------+----------+-------------+ None | - | f | f+ Public | - | f | f+ current_role | - | f | t+ current_user | - | f | f+ regress_testrol1 | session_user | t | f+ regress_testrol2 | current_role | f | t+ regress_testrol2 | current_user | f | t+ session_user | - | f | f+(8 rows)++ALTER ROLE CURRENT_ROLE WITH NOREPLICATION;
ALTER ROLE CURRENT_USER WITH REPLICATION;
SELECT * FROM chkrolattr();
role | rolekeyword | canlogin | replication
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | f
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | f
-(6 rows)+(8 rows)
ALTER ROLE "current_user" WITH REPLICATION;
SELECT * FROM chkrolattr();
@@ -136,11 +173,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | f
-(6 rows)+(8 rows)
ALTER ROLE SESSION_USER WITH REPLICATION;
SELECT * FROM chkrolattr();
@@ -148,11 +187,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | t
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | f
-(6 rows)+(8 rows)
ALTER ROLE "session_user" WITH REPLICATION;
SELECT * FROM chkrolattr();
@@ -160,11 +201,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | t
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | t
-(6 rows)+(8 rows)
ALTER USER "Public" WITH REPLICATION;
ALTER USER "None" WITH REPLICATION;
@@ -173,11 +216,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | t
Public | - | f | t
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | t
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | t
-(6 rows)+(8 rows)
ALTER USER regress_testrol1 WITH NOREPLICATION;
ALTER USER regress_testrol2 WITH NOREPLICATION;
@@ -186,21 +231,19 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | t
Public | - | f | t
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | f
regress_testrol2 | current_user | f | f
session_user | - | f | t
-(6 rows)+(8 rows)
ROLLBACK;
ALTER ROLE USER WITH LOGIN; -- error
ERROR: syntax error at or near "USER"
LINE 1: ALTER ROLE USER WITH LOGIN;
^
-ALTER ROLE CURRENT_ROLE WITH LOGIN; --error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER ROLE CURRENT_ROLE WITH LOGIN;- ^
ALTER ROLE ALL WITH REPLICATION; -- error
ERROR: syntax error at or near "WITH"
LINE 1: ALTER ROLE ALL WITH REPLICATION;
@@ -228,23 +271,56 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | f
current_user | - | f | f
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | f
regress_testrol2 | current_user | f | f
session_user | - | f | f
-(6 rows)+(8 rows)++ALTER USER CURRENT_ROLE WITH REPLICATION;+SELECT * FROM chkrolattr();+ role | rolekeyword | canlogin | replication +------------------+--------------+----------+-------------+ None | - | f | f+ Public | - | f | f+ current_role | - | f | f+ current_user | - | f | f+ regress_testrol1 | session_user | t | f+ regress_testrol2 | current_role | f | t+ regress_testrol2 | current_user | f | t+ session_user | - | f | f+(8 rows)++ALTER USER "current_role" WITH REPLICATION;+SELECT * FROM chkrolattr();+ role | rolekeyword | canlogin | replication +------------------+--------------+----------+-------------+ None | - | f | f+ Public | - | f | f+ current_role | - | f | t+ current_user | - | f | f+ regress_testrol1 | session_user | t | f+ regress_testrol2 | current_role | f | t+ regress_testrol2 | current_user | f | t+ session_user | - | f | f+(8 rows)+ALTER USER CURRENT_ROLE WITH NOREPLICATION;
ALTER USER CURRENT_USER WITH REPLICATION;
SELECT * FROM chkrolattr();
role | rolekeyword | canlogin | replication
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | f
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | f
-(6 rows)+(8 rows)
ALTER USER "current_user" WITH REPLICATION;
SELECT * FROM chkrolattr();
@@ -252,11 +328,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | f
-(6 rows)+(8 rows)
ALTER USER SESSION_USER WITH REPLICATION;
SELECT * FROM chkrolattr();
@@ -264,11 +342,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | t
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | f
-(6 rows)+(8 rows)
ALTER USER "session_user" WITH REPLICATION;
SELECT * FROM chkrolattr();
@@ -276,11 +356,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | f
Public | - | f | f
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | t
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | t
-(6 rows)+(8 rows)
ALTER USER "Public" WITH REPLICATION;
ALTER USER "None" WITH REPLICATION;
@@ -289,11 +371,13 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | t
Public | - | f | t
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | t
+ regress_testrol2 | current_role | f | t
regress_testrol2 | current_user | f | t
session_user | - | f | t
-(6 rows)+(8 rows)
ALTER USER regress_testrol1 WITH NOREPLICATION;
ALTER USER regress_testrol2 WITH NOREPLICATION;
@@ -302,21 +386,19 @@ SELECT * FROM chkrolattr();
------------------+--------------+----------+-------------
None | - | f | t
Public | - | f | t
+ current_role | - | f | t
current_user | - | f | t
regress_testrol1 | session_user | t | f
+ regress_testrol2 | current_role | f | f
regress_testrol2 | current_user | f | f
session_user | - | f | t
-(6 rows)+(8 rows)
ROLLBACK;
ALTER USER USER WITH LOGIN; -- error
ERROR: syntax error at or near "USER"
LINE 1: ALTER USER USER WITH LOGIN;
^
-ALTER USER CURRENT_ROLE WITH LOGIN; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER USER CURRENT_ROLE WITH LOGIN;- ^
ALTER USER ALL WITH REPLICATION; -- error
ERROR: syntax error at or near "WITH"
LINE 1: ALTER USER ALL WITH REPLICATION;
@@ -343,6 +425,7 @@ SELECT * FROM chksetconfig();
----+------+------------+-----------
(0 rows)
+ALTER ROLE CURRENT_ROLE SET application_name to 'BAZ';
ALTER ROLE CURRENT_USER SET application_name to 'FOO';
ALTER ROLE SESSION_USER SET application_name to 'BAR';
ALTER ROLE "current_user" SET application_name to 'FOOFOO';
@@ -355,7 +438,8 @@ SELECT * FROM chksetconfig();
ALL | current_user | - | {application_name=FOOFOO}
ALL | regress_testrol1 | session_user | {application_name=BAR}
ALL | regress_testrol2 | current_user | {application_name=FOO}
-(4 rows)+ ALL | regress_testrol2 | current_role | {application_name=FOO}+(5 rows)
ALTER ROLE regress_testrol1 SET application_name to 'SLAM';
SELECT * FROM chksetconfig();
@@ -365,8 +449,10 @@ SELECT * FROM chksetconfig();
ALL | current_user | - | {application_name=FOOFOO}
ALL | regress_testrol1 | session_user | {application_name=SLAM}
ALL | regress_testrol2 | current_user | {application_name=FOO}
-(4 rows)+ ALL | regress_testrol2 | current_role | {application_name=FOO}+(5 rows)+ALTER ROLE CURRENT_ROLE RESET application_name;
ALTER ROLE CURRENT_USER RESET application_name;
ALTER ROLE SESSION_USER RESET application_name;
ALTER ROLE "current_user" RESET application_name;
@@ -377,10 +463,6 @@ SELECT * FROM chksetconfig();
----+------+------------+-----------
(0 rows)
-ALTER ROLE CURRENT_ROLE SET application_name to 'BAZ'; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER ROLE CURRENT_ROLE SET application_name to 'BAZ';- ^
ALTER ROLE USER SET application_name to 'BOOM'; -- error
ERROR: syntax error at or near "USER"
LINE 1: ALTER ROLE USER SET application_name to 'BOOM';
@@ -395,6 +477,7 @@ SELECT * FROM chksetconfig();
----+------+------------+-----------
(0 rows)
+ALTER USER CURRENT_ROLE SET application_name to 'BAZ';
ALTER USER CURRENT_USER SET application_name to 'FOO';
ALTER USER SESSION_USER SET application_name to 'BAR';
ALTER USER "current_user" SET application_name to 'FOOFOO';
@@ -407,7 +490,8 @@ SELECT * FROM chksetconfig();
ALL | current_user | - | {application_name=FOOFOO}
ALL | regress_testrol1 | session_user | {application_name=BAR}
ALL | regress_testrol2 | current_user | {application_name=FOO}
-(4 rows)+ ALL | regress_testrol2 | current_role | {application_name=FOO}+(5 rows)
ALTER USER regress_testrol1 SET application_name to 'SLAM';
SELECT * FROM chksetconfig();
@@ -417,8 +501,10 @@ SELECT * FROM chksetconfig();
ALL | current_user | - | {application_name=FOOFOO}
ALL | regress_testrol1 | session_user | {application_name=SLAM}
ALL | regress_testrol2 | current_user | {application_name=FOO}
-(4 rows)+ ALL | regress_testrol2 | current_role | {application_name=FOO}+(5 rows)+ALTER USER CURRENT_ROLE RESET application_name;
ALTER USER CURRENT_USER RESET application_name;
ALTER USER SESSION_USER RESET application_name;
ALTER USER "current_user" RESET application_name;
@@ -429,10 +515,6 @@ SELECT * FROM chksetconfig();
----+------+------------+-----------
(0 rows)
-ALTER USER CURRENT_ROLE SET application_name to 'BAZ'; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER USER CURRENT_ROLE SET application_name to 'BAZ';- ^
ALTER USER USER SET application_name to 'BOOM'; -- error
ERROR: syntax error at or near "USER"
LINE 1: ALTER USER USER SET application_name to 'BOOM';
@@ -448,26 +530,23 @@ ERROR: role "nonexistent" does not exist
-- CREATE SCHEMA
CREATE SCHEMA newschema1 AUTHORIZATION CURRENT_USER;
CREATE SCHEMA newschema2 AUTHORIZATION "current_user";
-CREATE SCHEMA newschema3 AUTHORIZATION SESSION_USER;-CREATE SCHEMA newschema4 AUTHORIZATION regress_testrolx;-CREATE SCHEMA newschema5 AUTHORIZATION "Public";-CREATE SCHEMA newschema6 AUTHORIZATION USER; -- error+CREATE SCHEMA newschema3 AUTHORIZATION CURRENT_ROLE;+CREATE SCHEMA newschema4 AUTHORIZATION SESSION_USER;+CREATE SCHEMA newschema5 AUTHORIZATION regress_testrolx;+CREATE SCHEMA newschema6 AUTHORIZATION "Public";+CREATE SCHEMA newschemax AUTHORIZATION USER; -- error
ERROR: syntax error at or near "USER"
-LINE 1: CREATE SCHEMA newschema6 AUTHORIZATION USER;+LINE 1: CREATE SCHEMA newschemax AUTHORIZATION USER;
^
-CREATE SCHEMA newschema6 AUTHORIZATION CURRENT_ROLE; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: CREATE SCHEMA newschema6 AUTHORIZATION CURRENT_ROLE;- ^-CREATE SCHEMA newschema6 AUTHORIZATION PUBLIC; -- error+CREATE SCHEMA newschemax AUTHORIZATION PUBLIC; -- error
ERROR: role "public" does not exist
-CREATE SCHEMA newschema6 AUTHORIZATION "public"; -- error+CREATE SCHEMA newschemax AUTHORIZATION "public"; -- error
ERROR: role "public" does not exist
-CREATE SCHEMA newschema6 AUTHORIZATION NONE; -- error+CREATE SCHEMA newschemax AUTHORIZATION NONE; -- error
ERROR: role name "none" is reserved
-LINE 1: CREATE SCHEMA newschema6 AUTHORIZATION NONE;+LINE 1: CREATE SCHEMA newschemax AUTHORIZATION NONE;
^
-CREATE SCHEMA newschema6 AUTHORIZATION nonexistent; -- error+CREATE SCHEMA newschemax AUTHORIZATION nonexistent; -- error
ERROR: role "nonexistent" does not exist
SELECT n.nspname, r.rolname FROM pg_namespace n
JOIN pg_roles r ON (r.oid = n.nspowner)
@@ -476,38 +555,37 @@ SELECT n.nspname, r.rolname FROM pg_namespace n
------------+------------------
newschema1 | regress_testrol2
newschema2 | current_user
- newschema3 | regress_testrol1- newschema4 | regress_testrolx- newschema5 | Public-(5 rows)+ newschema3 | regress_testrol2+ newschema4 | regress_testrol1+ newschema5 | regress_testrolx+ newschema6 | Public+(6 rows)
CREATE SCHEMA IF NOT EXISTS newschema1 AUTHORIZATION CURRENT_USER;
NOTICE: schema "newschema1" already exists, skipping
CREATE SCHEMA IF NOT EXISTS newschema2 AUTHORIZATION "current_user";
NOTICE: schema "newschema2" already exists, skipping
-CREATE SCHEMA IF NOT EXISTS newschema3 AUTHORIZATION SESSION_USER;+CREATE SCHEMA IF NOT EXISTS newschema3 AUTHORIZATION CURRENT_ROLE;
NOTICE: schema "newschema3" already exists, skipping
-CREATE SCHEMA IF NOT EXISTS newschema4 AUTHORIZATION regress_testrolx;+CREATE SCHEMA IF NOT EXISTS newschema4 AUTHORIZATION SESSION_USER;
NOTICE: schema "newschema4" already exists, skipping
-CREATE SCHEMA IF NOT EXISTS newschema5 AUTHORIZATION "Public";+CREATE SCHEMA IF NOT EXISTS newschema5 AUTHORIZATION regress_testrolx;
NOTICE: schema "newschema5" already exists, skipping
-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION USER; -- error+CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION "Public";+NOTICE: schema "newschema6" already exists, skipping+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION USER; -- error
ERROR: syntax error at or near "USER"
-LINE 1: CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION USER;- ^-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION CURRENT_ROLE; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ...ATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION CURRENT_RO...+LINE 1: CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION USER;
^
-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION PUBLIC; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION PUBLIC; -- error
ERROR: role "public" does not exist
-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION "public"; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION "public"; -- error
ERROR: role "public" does not exist
-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION NONE; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION NONE; -- error
ERROR: role name "none" is reserved
-LINE 1: CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION NONE;+LINE 1: CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION NONE;
^
-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION nonexistent; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION nonexistent; -- error
ERROR: role "nonexistent" does not exist
SELECT n.nspname, r.rolname FROM pg_namespace n
JOIN pg_roles r ON (r.oid = n.nspowner)
@@ -516,10 +594,11 @@ SELECT n.nspname, r.rolname FROM pg_namespace n
------------+------------------
newschema1 | regress_testrol2
newschema2 | current_user
- newschema3 | regress_testrol1- newschema4 | regress_testrolx- newschema5 | Public-(5 rows)+ newschema3 | regress_testrol2+ newschema4 | regress_testrol1+ newschema5 | regress_testrolx+ newschema6 | Public+(6 rows)
-- ALTER TABLE OWNER TO
\c -
@@ -530,27 +609,25 @@ CREATE TABLE testtab3 (a int);
CREATE TABLE testtab4 (a int);
CREATE TABLE testtab5 (a int);
CREATE TABLE testtab6 (a int);
+CREATE TABLE testtab7 (a int);
\c -
SET SESSION AUTHORIZATION regress_testrol1;
SET ROLE regress_testrol2;
ALTER TABLE testtab1 OWNER TO CURRENT_USER;
ALTER TABLE testtab2 OWNER TO "current_user";
-ALTER TABLE testtab3 OWNER TO SESSION_USER;-ALTER TABLE testtab4 OWNER TO regress_testrolx;-ALTER TABLE testtab5 OWNER TO "Public";-ALTER TABLE testtab6 OWNER TO CURRENT_ROLE; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER TABLE testtab6 OWNER TO CURRENT_ROLE;- ^-ALTER TABLE testtab6 OWNER TO USER; --error+ALTER TABLE testtab3 OWNER TO CURRENT_ROLE;+ALTER TABLE testtab4 OWNER TO SESSION_USER;+ALTER TABLE testtab5 OWNER TO regress_testrolx;+ALTER TABLE testtab6 OWNER TO "Public";+ALTER TABLE testtab7 OWNER TO USER; --error
ERROR: syntax error at or near "USER"
-LINE 1: ALTER TABLE testtab6 OWNER TO USER;+LINE 1: ALTER TABLE testtab7 OWNER TO USER;
^
-ALTER TABLE testtab6 OWNER TO PUBLIC; -- error+ALTER TABLE testtab7 OWNER TO PUBLIC; -- error
ERROR: role "public" does not exist
-ALTER TABLE testtab6 OWNER TO "public"; -- error+ALTER TABLE testtab7 OWNER TO "public"; -- error
ERROR: role "public" does not exist
-ALTER TABLE testtab6 OWNER TO nonexistent; -- error+ALTER TABLE testtab7 OWNER TO nonexistent; -- error
ERROR: role "nonexistent" does not exist
SELECT c.relname, r.rolname
FROM pg_class c JOIN pg_roles r ON (r.oid = c.relowner)
@@ -560,11 +637,12 @@ SELECT c.relname, r.rolname
----------+------------------
testtab1 | regress_testrol2
testtab2 | current_user
- testtab3 | regress_testrol1- testtab4 | regress_testrolx- testtab5 | Public- testtab6 | regress_testrol0-(6 rows)+ testtab3 | regress_testrol2+ testtab4 | regress_testrol1+ testtab5 | regress_testrolx+ testtab6 | Public+ testtab7 | regress_testrol0+(7 rows)
-- ALTER TABLE, VIEW, MATERIALIZED VIEW, FOREIGN TABLE, SEQUENCE are
-- changed their owner in the same way.
@@ -580,27 +658,25 @@ CREATE AGGREGATE testagg6(int2) (SFUNC = int2_sum, STYPE = int8);
CREATE AGGREGATE testagg7(int2) (SFUNC = int2_sum, STYPE = int8);
CREATE AGGREGATE testagg8(int2) (SFUNC = int2_sum, STYPE = int8);
CREATE AGGREGATE testagg9(int2) (SFUNC = int2_sum, STYPE = int8);
+CREATE AGGREGATE testagga(int2) (SFUNC = int2_sum, STYPE = int8);
\c -
SET SESSION AUTHORIZATION regress_testrol1;
SET ROLE regress_testrol2;
ALTER AGGREGATE testagg1(int2) OWNER TO CURRENT_USER;
ALTER AGGREGATE testagg2(int2) OWNER TO "current_user";
-ALTER AGGREGATE testagg3(int2) OWNER TO SESSION_USER;-ALTER AGGREGATE testagg4(int2) OWNER TO regress_testrolx;-ALTER AGGREGATE testagg5(int2) OWNER TO "Public";-ALTER AGGREGATE testagg5(int2) OWNER TO CURRENT_ROLE; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER AGGREGATE testagg5(int2) OWNER TO CURRENT_ROLE;- ^-ALTER AGGREGATE testagg5(int2) OWNER TO USER; -- error+ALTER AGGREGATE testagg3(int2) OWNER TO CURRENT_ROLE;+ALTER AGGREGATE testagg4(int2) OWNER TO SESSION_USER;+ALTER AGGREGATE testagg5(int2) OWNER TO regress_testrolx;+ALTER AGGREGATE testagg6(int2) OWNER TO "Public";+ALTER AGGREGATE testagg6(int2) OWNER TO USER; -- error
ERROR: syntax error at or near "USER"
-LINE 1: ALTER AGGREGATE testagg5(int2) OWNER TO USER;+LINE 1: ALTER AGGREGATE testagg6(int2) OWNER TO USER;
^
-ALTER AGGREGATE testagg5(int2) OWNER TO PUBLIC; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO PUBLIC; -- error
ERROR: role "public" does not exist
-ALTER AGGREGATE testagg5(int2) OWNER TO "public"; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO "public"; -- error
ERROR: role "public" does not exist
-ALTER AGGREGATE testagg5(int2) OWNER TO nonexistent; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO nonexistent; -- error
ERROR: role "nonexistent" does not exist
SELECT p.proname, r.rolname
FROM pg_proc p JOIN pg_roles r ON (r.oid = p.proowner)
@@ -610,14 +686,15 @@ SELECT p.proname, r.rolname
----------+------------------
testagg1 | regress_testrol2
testagg2 | current_user
- testagg3 | regress_testrol1- testagg4 | regress_testrolx- testagg5 | Public- testagg6 | regress_testrol0+ testagg3 | regress_testrol2+ testagg4 | regress_testrol1+ testagg5 | regress_testrolx+ testagg6 | Public
testagg7 | regress_testrol0
testagg8 | regress_testrol0
testagg9 | regress_testrol0
-(9 rows)+ testagga | regress_testrol0+(10 rows)
-- CREATE USER MAPPING
CREATE FOREIGN DATA WRAPPER test_wrapper;
@@ -630,58 +707,52 @@ CREATE SERVER sv6 FOREIGN DATA WRAPPER test_wrapper;
CREATE SERVER sv7 FOREIGN DATA WRAPPER test_wrapper;
CREATE SERVER sv8 FOREIGN DATA WRAPPER test_wrapper;
CREATE SERVER sv9 FOREIGN DATA WRAPPER test_wrapper;
+CREATE SERVER sv10 FOREIGN DATA WRAPPER test_wrapper;
CREATE USER MAPPING FOR CURRENT_USER SERVER sv1 OPTIONS (user 'CURRENT_USER');
CREATE USER MAPPING FOR "current_user" SERVER sv2 OPTIONS (user '"current_user"');
-CREATE USER MAPPING FOR USER SERVER sv3 OPTIONS (user 'USER');-CREATE USER MAPPING FOR "user" SERVER sv4 OPTIONS (user '"USER"');-CREATE USER MAPPING FOR SESSION_USER SERVER sv5 OPTIONS (user 'SESSION_USER');-CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');-CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');-CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');-CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9- OPTIONS (user 'CURRENT_ROLE'); -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9- ^-CREATE USER MAPPING FOR nonexistent SERVER sv9- OPTIONS (user 'nonexistent'); -- error;+CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv3 OPTIONS (user 'CURRENT_ROLE');+CREATE USER MAPPING FOR USER SERVER sv4 OPTIONS (user 'USER');+CREATE USER MAPPING FOR "user" SERVER sv5 OPTIONS (user '"USER"');+CREATE USER MAPPING FOR SESSION_USER SERVER sv6 OPTIONS (user 'SESSION_USER');+CREATE USER MAPPING FOR PUBLIC SERVER sv7 OPTIONS (user 'PUBLIC');+CREATE USER MAPPING FOR "Public" SERVER sv8 OPTIONS (user '"Public"');+CREATE USER MAPPING FOR regress_testrolx SERVER sv9 OPTIONS (user 'regress_testrolx');+CREATE USER MAPPING FOR nonexistent SERVER sv10 OPTIONS (user 'nonexistent'); -- error;
ERROR: role "nonexistent" does not exist
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+---------------------------
regress_testrol2 | sv1 | {user=CURRENT_USER}
current_user | sv2 | {"user=\"current_user\""}
- regress_testrol2 | sv3 | {user=USER}- user | sv4 | {"user=\"USER\""}- regress_testrol1 | sv5 | {user=SESSION_USER}- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}-(8 rows)+ regress_testrol2 | sv3 | {user=CURRENT_ROLE}+ regress_testrol2 | sv4 | {user=USER}+ user | sv5 | {"user=\"USER\""}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}+(9 rows)
-- ALTER USER MAPPING
ALTER USER MAPPING FOR CURRENT_USER SERVER sv1
OPTIONS (SET user 'CURRENT_USER_alt');
ALTER USER MAPPING FOR "current_user" SERVER sv2
OPTIONS (SET user '"current_user"_alt');
-ALTER USER MAPPING FOR USER SERVER sv3+ALTER USER MAPPING FOR CURRENT_ROLE SERVER sv3+ OPTIONS (SET user 'CURRENT_ROLE_alt');+ALTER USER MAPPING FOR USER SERVER sv4
OPTIONS (SET user 'USER_alt');
-ALTER USER MAPPING FOR "user" SERVER sv4+ALTER USER MAPPING FOR "user" SERVER sv5
OPTIONS (SET user '"user"_alt');
-ALTER USER MAPPING FOR SESSION_USER SERVER sv5+ALTER USER MAPPING FOR SESSION_USER SERVER sv6
OPTIONS (SET user 'SESSION_USER_alt');
-ALTER USER MAPPING FOR PUBLIC SERVER sv6+ALTER USER MAPPING FOR PUBLIC SERVER sv7
OPTIONS (SET user 'public_alt');
-ALTER USER MAPPING FOR "Public" SERVER sv7+ALTER USER MAPPING FOR "Public" SERVER sv8
OPTIONS (SET user '"Public"_alt');
-ALTER USER MAPPING FOR regress_testrolx SERVER sv8+ALTER USER MAPPING FOR regress_testrolx SERVER sv9
OPTIONS (SET user 'regress_testrolx_alt');
-ALTER USER MAPPING FOR CURRENT_ROLE SERVER sv9- OPTIONS (SET user 'CURRENT_ROLE_alt');-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ALTER USER MAPPING FOR CURRENT_ROLE SERVER sv9- ^-ALTER USER MAPPING FOR nonexistent SERVER sv9+ALTER USER MAPPING FOR nonexistent SERVER sv10
OPTIONS (SET user 'nonexistent_alt'); -- error
ERROR: role "nonexistent" does not exist
SELECT * FROM chkumapping();
@@ -689,28 +760,26 @@ SELECT * FROM chkumapping();
------------------+----------+-------------------------------
regress_testrol2 | sv1 | {user=CURRENT_USER_alt}
current_user | sv2 | {"user=\"current_user\"_alt"}
- regress_testrol2 | sv3 | {user=USER_alt}- user | sv4 | {"user=\"user\"_alt"}- regress_testrol1 | sv5 | {user=SESSION_USER_alt}- | sv6 | {user=public_alt}- Public | sv7 | {"user=\"Public\"_alt"}- regress_testrolx | sv8 | {user=regress_testrolx_alt}-(8 rows)+ regress_testrol2 | sv3 | {user=CURRENT_ROLE_alt}+ regress_testrol2 | sv4 | {user=USER_alt}+ user | sv5 | {"user=\"user\"_alt"}+ regress_testrol1 | sv6 | {user=SESSION_USER_alt}+ | sv7 | {user=public_alt}+ Public | sv8 | {"user=\"Public\"_alt"}+ regress_testrolx | sv9 | {user=regress_testrolx_alt}+(9 rows)
-- DROP USER MAPPING
DROP USER MAPPING FOR CURRENT_USER SERVER sv1;
DROP USER MAPPING FOR "current_user" SERVER sv2;
-DROP USER MAPPING FOR USER SERVER sv3;-DROP USER MAPPING FOR "user" SERVER sv4;-DROP USER MAPPING FOR SESSION_USER SERVER sv5;-DROP USER MAPPING FOR PUBLIC SERVER sv6;-DROP USER MAPPING FOR "Public" SERVER sv7;-DROP USER MAPPING FOR regress_testrolx SERVER sv8;-DROP USER MAPPING FOR CURRENT_ROLE SERVER sv9; -- error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: DROP USER MAPPING FOR CURRENT_ROLE SERVER sv9;- ^-DROP USER MAPPING FOR nonexistent SERVER sv; -- error+DROP USER MAPPING FOR CURRENT_ROLE SERVER sv3;+DROP USER MAPPING FOR USER SERVER sv4;+DROP USER MAPPING FOR "user" SERVER sv5;+DROP USER MAPPING FOR SESSION_USER SERVER sv6;+DROP USER MAPPING FOR PUBLIC SERVER sv7;+DROP USER MAPPING FOR "Public" SERVER sv8;+DROP USER MAPPING FOR regress_testrolx SERVER sv9;+DROP USER MAPPING FOR nonexistent SERVER sv10; -- error
ERROR: role "nonexistent" does not exist
SELECT * FROM chkumapping();
umname | umserver | umoptions
@@ -719,24 +788,26 @@ SELECT * FROM chkumapping();
CREATE USER MAPPING FOR CURRENT_USER SERVER sv1 OPTIONS (user 'CURRENT_USER');
CREATE USER MAPPING FOR "current_user" SERVER sv2 OPTIONS (user '"current_user"');
-CREATE USER MAPPING FOR USER SERVER sv3 OPTIONS (user 'USER');-CREATE USER MAPPING FOR "user" SERVER sv4 OPTIONS (user '"USER"');-CREATE USER MAPPING FOR SESSION_USER SERVER sv5 OPTIONS (user 'SESSION_USER');-CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');-CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');-CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');+CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv3 OPTIONS (user 'CURRENT_ROLE');+CREATE USER MAPPING FOR USER SERVER sv4 OPTIONS (user 'USER');+CREATE USER MAPPING FOR "user" SERVER sv5 OPTIONS (user '"USER"');+CREATE USER MAPPING FOR SESSION_USER SERVER sv6 OPTIONS (user 'SESSION_USER');+CREATE USER MAPPING FOR PUBLIC SERVER sv7 OPTIONS (user 'PUBLIC');+CREATE USER MAPPING FOR "Public" SERVER sv8 OPTIONS (user '"Public"');+CREATE USER MAPPING FOR regress_testrolx SERVER sv9 OPTIONS (user 'regress_testrolx');
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+---------------------------
regress_testrol2 | sv1 | {user=CURRENT_USER}
current_user | sv2 | {"user=\"current_user\""}
- regress_testrol2 | sv3 | {user=USER}- user | sv4 | {"user=\"USER\""}- regress_testrol1 | sv5 | {user=SESSION_USER}- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}-(8 rows)+ regress_testrol2 | sv3 | {user=CURRENT_ROLE}+ regress_testrol2 | sv4 | {user=USER}+ user | sv5 | {"user=\"USER\""}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}+(9 rows)
-- DROP USER MAPPING IF EXISTS
DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER sv1;
@@ -744,82 +815,92 @@ SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+---------------------------
current_user | sv2 | {"user=\"current_user\""}
- regress_testrol2 | sv3 | {user=USER}- user | sv4 | {"user=\"USER\""}- regress_testrol1 | sv5 | {user=SESSION_USER}- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}-(7 rows)+ regress_testrol2 | sv3 | {user=CURRENT_ROLE}+ regress_testrol2 | sv4 | {user=USER}+ user | sv5 | {"user=\"USER\""}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}+(8 rows)
DROP USER MAPPING IF EXISTS FOR "current_user" SERVER sv2;
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+-------------------------
- regress_testrol2 | sv3 | {user=USER}- user | sv4 | {"user=\"USER\""}- regress_testrol1 | sv5 | {user=SESSION_USER}- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}+ regress_testrol2 | sv3 | {user=CURRENT_ROLE}+ regress_testrol2 | sv4 | {user=USER}+ user | sv5 | {"user=\"USER\""}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}+(7 rows)++DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER sv3;+SELECT * FROM chkumapping();+ umname | umserver | umoptions +------------------+----------+-------------------------+ regress_testrol2 | sv4 | {user=USER}+ user | sv5 | {"user=\"USER\""}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}
(6 rows)
-DROP USER MAPPING IF EXISTS FOR USER SERVER sv3;+DROP USER MAPPING IF EXISTS FOR USER SERVER sv4;
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+-------------------------
- user | sv4 | {"user=\"USER\""}- regress_testrol1 | sv5 | {user=SESSION_USER}- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}+ user | sv5 | {"user=\"USER\""}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}
(5 rows)
-DROP USER MAPPING IF EXISTS FOR "user" SERVER sv4;+DROP USER MAPPING IF EXISTS FOR "user" SERVER sv5;
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+-------------------------
- regress_testrol1 | sv5 | {user=SESSION_USER}- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}+ regress_testrol1 | sv6 | {user=SESSION_USER}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}
(4 rows)
-DROP USER MAPPING IF EXISTS FOR SESSION_USER SERVER sv5;+DROP USER MAPPING IF EXISTS FOR SESSION_USER SERVER sv6;
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+-------------------------
- | sv6 | {user=PUBLIC}- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}+ | sv7 | {user=PUBLIC}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}
(3 rows)
-DROP USER MAPPING IF EXISTS FOR PUBLIC SERVER sv6;+DROP USER MAPPING IF EXISTS FOR PUBLIC SERVER sv7;
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+-------------------------
- Public | sv7 | {"user=\"Public\""}- regress_testrolx | sv8 | {user=regress_testrolx}+ Public | sv8 | {"user=\"Public\""}+ regress_testrolx | sv9 | {user=regress_testrolx}
(2 rows)
-DROP USER MAPPING IF EXISTS FOR "Public" SERVER sv7;+DROP USER MAPPING IF EXISTS FOR "Public" SERVER sv8;
SELECT * FROM chkumapping();
umname | umserver | umoptions
------------------+----------+-------------------------
- regress_testrolx | sv8 | {user=regress_testrolx}+ regress_testrolx | sv9 | {user=regress_testrolx}
(1 row)
-DROP USER MAPPING IF EXISTS FOR regress_testrolx SERVER sv8;+DROP USER MAPPING IF EXISTS FOR regress_testrolx SERVER sv9;
SELECT * FROM chkumapping();
umname | umserver | umoptions
--------+----------+-----------
(0 rows)
-DROP USER MAPPING IF EXISTS FOR CURRENT_ROLE SERVER sv9; --error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: DROP USER MAPPING IF EXISTS FOR CURRENT_ROLE SERVER sv9;- ^-DROP USER MAPPING IF EXISTS FOR nonexistent SERVER sv9; -- error+DROP USER MAPPING IF EXISTS FOR nonexistent SERVER sv10; -- error
NOTICE: role "nonexistent" does not exist, skipping
-- GRANT/REVOKE
GRANT regress_testrol0 TO pg_signal_backend; -- success
@@ -840,7 +921,8 @@ SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
testagg7 |
testagg8 |
testagg9 |
-(9 rows)+ testagga | +(10 rows)
REVOKE ALL PRIVILEGES ON FUNCTION testagg1(int2) FROM PUBLIC;
REVOKE ALL PRIVILEGES ON FUNCTION testagg2(int2) FROM PUBLIC;
@@ -853,108 +935,106 @@ REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2) FROM PUBLIC;
GRANT ALL PRIVILEGES ON FUNCTION testagg1(int2) TO PUBLIC;
GRANT ALL PRIVILEGES ON FUNCTION testagg2(int2) TO CURRENT_USER;
GRANT ALL PRIVILEGES ON FUNCTION testagg3(int2) TO "current_user";
-GRANT ALL PRIVILEGES ON FUNCTION testagg4(int2) TO SESSION_USER;-GRANT ALL PRIVILEGES ON FUNCTION testagg5(int2) TO "Public";-GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx;-GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public";-GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2)+GRANT ALL PRIVILEGES ON FUNCTION testagg4(int2) TO CURRENT_ROLE;+GRANT ALL PRIVILEGES ON FUNCTION testagg5(int2) TO SESSION_USER;+GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO "Public";+GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO regress_testrolx;+GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2) TO "public";+GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2)
TO current_user, public, regress_testrolx;
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
proname | proacl
----------+-----------------------------------------------------------------------------------------------------------------------------------
testagg1 | {regress_testrol2=X/regress_testrol2,=X/regress_testrol2}
testagg2 | {current_user=X/current_user,regress_testrol2=X/current_user}
- testagg3 | {regress_testrol1=X/regress_testrol1,current_user=X/regress_testrol1}- testagg4 | {regress_testrolx=X/regress_testrolx,regress_testrol1=X/regress_testrolx}- testagg5 | {Public=X/Public}- testagg6 | {regress_testrol0=X/regress_testrol0,regress_testrolx=X/regress_testrol0}- testagg7 | {regress_testrol0=X/regress_testrol0,=X/regress_testrol0}- testagg8 | {regress_testrol0=X/regress_testrol0,regress_testrol2=X/regress_testrol0,=X/regress_testrol0,regress_testrolx=X/regress_testrol0}- testagg9 | -(9 rows)+ testagg3 | {regress_testrol2=X/regress_testrol2,current_user=X/regress_testrol2}+ testagg4 | {regress_testrol1=X/regress_testrol1,regress_testrol2=X/regress_testrol1}+ testagg5 | {regress_testrolx=X/regress_testrolx,regress_testrol1=X/regress_testrolx}+ testagg6 | {Public=X/Public}+ testagg7 | {regress_testrol0=X/regress_testrol0,regress_testrolx=X/regress_testrol0}+ testagg8 | {regress_testrol0=X/regress_testrol0,=X/regress_testrol0}+ testagg9 | {=X/regress_testrol0,regress_testrol0=X/regress_testrol0,regress_testrol2=X/regress_testrol0,regress_testrolx=X/regress_testrol0}+ testagga | +(10 rows)-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO CURRENT_ROLE; --error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ...RANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO CURRENT_RO...- ^-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO USER; --error+GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO USER; --error
ERROR: syntax error at or near "USER"
-LINE 1: GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO USER;+LINE 1: GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO USER;
^
-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO NONE; --error+GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO NONE; --error
ERROR: role name "none" is reserved
-LINE 1: GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO NONE;+LINE 1: GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO NONE;
^
-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO "none"; --error+GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO "none"; --error
ERROR: role name "none" is reserved
-LINE 1: GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO "none";+LINE 1: GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO "none";
^
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
proname | proacl
----------+-----------------------------------------------------------------------------------------------------------------------------------
testagg1 | {regress_testrol2=X/regress_testrol2,=X/regress_testrol2}
testagg2 | {current_user=X/current_user,regress_testrol2=X/current_user}
- testagg3 | {regress_testrol1=X/regress_testrol1,current_user=X/regress_testrol1}- testagg4 | {regress_testrolx=X/regress_testrolx,regress_testrol1=X/regress_testrolx}- testagg5 | {Public=X/Public}- testagg6 | {regress_testrol0=X/regress_testrol0,regress_testrolx=X/regress_testrol0}- testagg7 | {regress_testrol0=X/regress_testrol0,=X/regress_testrol0}- testagg8 | {regress_testrol0=X/regress_testrol0,regress_testrol2=X/regress_testrol0,=X/regress_testrol0,regress_testrolx=X/regress_testrol0}- testagg9 | -(9 rows)+ testagg3 | {regress_testrol2=X/regress_testrol2,current_user=X/regress_testrol2}+ testagg4 | {regress_testrol1=X/regress_testrol1,regress_testrol2=X/regress_testrol1}+ testagg5 | {regress_testrolx=X/regress_testrolx,regress_testrol1=X/regress_testrolx}+ testagg6 | {Public=X/Public}+ testagg7 | {regress_testrol0=X/regress_testrol0,regress_testrolx=X/regress_testrol0}+ testagg8 | {regress_testrol0=X/regress_testrol0,=X/regress_testrol0}+ testagg9 | {=X/regress_testrol0,regress_testrol0=X/regress_testrol0,regress_testrol2=X/regress_testrol0,regress_testrolx=X/regress_testrol0}+ testagga | +(10 rows)
REVOKE ALL PRIVILEGES ON FUNCTION testagg1(int2) FROM PUBLIC;
REVOKE ALL PRIVILEGES ON FUNCTION testagg2(int2) FROM CURRENT_USER;
REVOKE ALL PRIVILEGES ON FUNCTION testagg3(int2) FROM "current_user";
-REVOKE ALL PRIVILEGES ON FUNCTION testagg4(int2) FROM SESSION_USER;-REVOKE ALL PRIVILEGES ON FUNCTION testagg5(int2) FROM "Public";-REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx;-REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public";-REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2)+REVOKE ALL PRIVILEGES ON FUNCTION testagg4(int2) FROM CURRENT_ROLE;+REVOKE ALL PRIVILEGES ON FUNCTION testagg5(int2) FROM SESSION_USER;+REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM "Public";+REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM regress_testrolx;+REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2) FROM "public";+REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2)
FROM current_user, public, regress_testrolx;
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
proname | proacl
----------+---------------------------------------
testagg1 | {regress_testrol2=X/regress_testrol2}
testagg2 | {current_user=X/current_user}
- testagg3 | {regress_testrol1=X/regress_testrol1}- testagg4 | {regress_testrolx=X/regress_testrolx}- testagg5 | {}- testagg6 | {regress_testrol0=X/regress_testrol0}+ testagg3 | {regress_testrol2=X/regress_testrol2}+ testagg4 | {regress_testrol1=X/regress_testrol1}+ testagg5 | {regress_testrolx=X/regress_testrolx}+ testagg6 | {}
testagg7 | {regress_testrol0=X/regress_testrol0}
testagg8 | {regress_testrol0=X/regress_testrol0}
- testagg9 | -(9 rows)+ testagg9 | {regress_testrol0=X/regress_testrol0}+ testagga | +(10 rows)-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM CURRENT_ROLE; --error-ERROR: syntax error at or near "CURRENT_ROLE"-LINE 1: ...KE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM CURRENT_RO...- ^-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM USER; --error+REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM USER; --error
ERROR: syntax error at or near "USER"
-LINE 1: REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM USER;+LINE 1: REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM USER;
^
-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM NONE; --error+REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM NONE; --error
ERROR: role name "none" is reserved
-LINE 1: REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM NONE;+LINE 1: REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM NONE;
^
-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM "none"; --error+REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM "none"; --error
ERROR: role name "none" is reserved
-LINE 1: ...EVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM "none";+LINE 1: ...EVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM "none";
^
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
proname | proacl
----------+---------------------------------------
testagg1 | {regress_testrol2=X/regress_testrol2}
testagg2 | {current_user=X/current_user}
- testagg3 | {regress_testrol1=X/regress_testrol1}- testagg4 | {regress_testrolx=X/regress_testrolx}- testagg5 | {}- testagg6 | {regress_testrol0=X/regress_testrol0}+ testagg3 | {regress_testrol2=X/regress_testrol2}+ testagg4 | {regress_testrol1=X/regress_testrol1}+ testagg5 | {regress_testrolx=X/regress_testrolx}+ testagg6 | {}
testagg7 | {regress_testrol0=X/regress_testrol0}
testagg8 | {regress_testrol0=X/regress_testrol0}
- testagg9 | -(9 rows)+ testagg9 | {regress_testrol0=X/regress_testrol0}+ testagga | +(10 rows)
-- DEFAULT MONITORING ROLES
CREATE ROLE regress_role_haspriv;
diff --git a/src/test/modules/unsafe_tests/sql/rolenames.sql b/src/test/modules/unsafe_tests/sql/rolenames.sqlindex c3013c1464..9227de9e8c 100644--- a/src/test/modules/unsafe_tests/sql/rolenames.sql+++ b/src/test/modules/unsafe_tests/sql/rolenames.sql@@ -3,8 +3,10 @@ CREATE OR REPLACE FUNCTION chkrolattr()
AS $$
SELECT r.rolname, v.keyword, r.rolcanlogin, r.rolreplication
FROM pg_roles r
- JOIN (VALUES(CURRENT_USER, 'current_user'),+ JOIN (VALUES(CURRENT_ROLE, 'current_role'),+ (CURRENT_USER, 'current_user'),
(SESSION_USER, 'session_user'),
+ ('current_role', '-'),
('current_user', '-'),
('session_user', '-'),
('Public', '-'),
@@ -22,8 +24,9 @@ CREATE OR REPLACE FUNCTION chksetconfig()
FROM pg_db_role_setting s
LEFT JOIN pg_roles r ON (r.oid = s.setrole)
LEFT JOIN pg_database d ON (d.oid = s.setdatabase)
- LEFT JOIN (VALUES(CURRENT_USER, 'current_user'),- (SESSION_USER, 'session_user'))+ LEFT JOIN (VALUES(CURRENT_ROLE, 'current_role'),+ (CURRENT_USER, 'current_user'),+ (SESSION_USER, 'session_user'))
AS v(uname, keyword)
ON (r.rolname = v.uname)
WHERE (r.rolname) IN ('Public', 'current_user', 'regress_testrol1', 'regress_testrol2')
@@ -50,6 +53,7 @@ CREATE OR REPLACE FUNCTION chkumapping()
CREATE ROLE "Public";
CREATE ROLE "None";
+CREATE ROLE "current_role";
CREATE ROLE "current_user";
CREATE ROLE "session_user";
CREATE ROLE "user";
@@ -84,6 +88,11 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
-- ALTER ROLE
BEGIN;
SELECT * FROM chkrolattr();
+ALTER ROLE CURRENT_ROLE WITH REPLICATION;+SELECT * FROM chkrolattr();+ALTER ROLE "current_role" WITH REPLICATION;+SELECT * FROM chkrolattr();+ALTER ROLE CURRENT_ROLE WITH NOREPLICATION;
ALTER ROLE CURRENT_USER WITH REPLICATION;
SELECT * FROM chkrolattr();
ALTER ROLE "current_user" WITH REPLICATION;
@@ -101,7 +110,6 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
ROLLBACK;
ALTER ROLE USER WITH LOGIN; -- error
-ALTER ROLE CURRENT_ROLE WITH LOGIN; --error
ALTER ROLE ALL WITH REPLICATION; -- error
ALTER ROLE SESSION_ROLE WITH NOREPLICATION; -- error
ALTER ROLE PUBLIC WITH NOREPLICATION; -- error
@@ -113,6 +121,11 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
-- ALTER USER
BEGIN;
SELECT * FROM chkrolattr();
+ALTER USER CURRENT_ROLE WITH REPLICATION;+SELECT * FROM chkrolattr();+ALTER USER "current_role" WITH REPLICATION;+SELECT * FROM chkrolattr();+ALTER USER CURRENT_ROLE WITH NOREPLICATION;
ALTER USER CURRENT_USER WITH REPLICATION;
SELECT * FROM chkrolattr();
ALTER USER "current_user" WITH REPLICATION;
@@ -130,7 +143,6 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
ROLLBACK;
ALTER USER USER WITH LOGIN; -- error
-ALTER USER CURRENT_ROLE WITH LOGIN; -- error
ALTER USER ALL WITH REPLICATION; -- error
ALTER USER SESSION_ROLE WITH NOREPLICATION; -- error
ALTER USER PUBLIC WITH NOREPLICATION; -- error
@@ -141,6 +153,7 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
-- ALTER ROLE SET/RESET
SELECT * FROM chksetconfig();
+ALTER ROLE CURRENT_ROLE SET application_name to 'BAZ';
ALTER ROLE CURRENT_USER SET application_name to 'FOO';
ALTER ROLE SESSION_USER SET application_name to 'BAR';
ALTER ROLE "current_user" SET application_name to 'FOOFOO';
@@ -149,6 +162,7 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
SELECT * FROM chksetconfig();
ALTER ROLE regress_testrol1 SET application_name to 'SLAM';
SELECT * FROM chksetconfig();
+ALTER ROLE CURRENT_ROLE RESET application_name;
ALTER ROLE CURRENT_USER RESET application_name;
ALTER ROLE SESSION_USER RESET application_name;
ALTER ROLE "current_user" RESET application_name;
@@ -157,13 +171,13 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
SELECT * FROM chksetconfig();
-ALTER ROLE CURRENT_ROLE SET application_name to 'BAZ'; -- error
ALTER ROLE USER SET application_name to 'BOOM'; -- error
ALTER ROLE PUBLIC SET application_name to 'BOMB'; -- error
ALTER ROLE nonexistent SET application_name to 'BOMB'; -- error
-- ALTER USER SET/RESET
SELECT * FROM chksetconfig();
+ALTER USER CURRENT_ROLE SET application_name to 'BAZ';
ALTER USER CURRENT_USER SET application_name to 'FOO';
ALTER USER SESSION_USER SET application_name to 'BAR';
ALTER USER "current_user" SET application_name to 'FOOFOO';
@@ -172,6 +186,7 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
SELECT * FROM chksetconfig();
ALTER USER regress_testrol1 SET application_name to 'SLAM';
SELECT * FROM chksetconfig();
+ALTER USER CURRENT_ROLE RESET application_name;
ALTER USER CURRENT_USER RESET application_name;
ALTER USER SESSION_USER RESET application_name;
ALTER USER "current_user" RESET application_name;
@@ -180,7 +195,6 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
SELECT * FROM chksetconfig();
-ALTER USER CURRENT_ROLE SET application_name to 'BAZ'; -- error
ALTER USER USER SET application_name to 'BOOM'; -- error
ALTER USER PUBLIC SET application_name to 'BOMB'; -- error
ALTER USER NONE SET application_name to 'BOMB'; -- error
@@ -189,16 +203,16 @@ CREATE ROLE regress_testrol1 SUPERUSER LOGIN IN ROLE regress_testrol2;
-- CREATE SCHEMA
CREATE SCHEMA newschema1 AUTHORIZATION CURRENT_USER;
CREATE SCHEMA newschema2 AUTHORIZATION "current_user";
-CREATE SCHEMA newschema3 AUTHORIZATION SESSION_USER;-CREATE SCHEMA newschema4 AUTHORIZATION regress_testrolx;-CREATE SCHEMA newschema5 AUTHORIZATION "Public";+CREATE SCHEMA newschema3 AUTHORIZATION CURRENT_ROLE;+CREATE SCHEMA newschema4 AUTHORIZATION SESSION_USER;+CREATE SCHEMA newschema5 AUTHORIZATION regress_testrolx;+CREATE SCHEMA newschema6 AUTHORIZATION "Public";-CREATE SCHEMA newschema6 AUTHORIZATION USER; -- error-CREATE SCHEMA newschema6 AUTHORIZATION CURRENT_ROLE; -- error-CREATE SCHEMA newschema6 AUTHORIZATION PUBLIC; -- error-CREATE SCHEMA newschema6 AUTHORIZATION "public"; -- error-CREATE SCHEMA newschema6 AUTHORIZATION NONE; -- error-CREATE SCHEMA newschema6 AUTHORIZATION nonexistent; -- error+CREATE SCHEMA newschemax AUTHORIZATION USER; -- error+CREATE SCHEMA newschemax AUTHORIZATION PUBLIC; -- error+CREATE SCHEMA newschemax AUTHORIZATION "public"; -- error+CREATE SCHEMA newschemax AUTHORIZATION NONE; -- error+CREATE SCHEMA newschemax AUTHORIZATION nonexistent; -- error
SELECT n.nspname, r.rolname FROM pg_namespace n
JOIN pg_roles r ON (r.oid = n.nspowner)
@@ -206,16 +220,16 @@ CREATE SCHEMA newschema6 AUTHORIZATION nonexistent; -- error
CREATE SCHEMA IF NOT EXISTS newschema1 AUTHORIZATION CURRENT_USER;
CREATE SCHEMA IF NOT EXISTS newschema2 AUTHORIZATION "current_user";
-CREATE SCHEMA IF NOT EXISTS newschema3 AUTHORIZATION SESSION_USER;-CREATE SCHEMA IF NOT EXISTS newschema4 AUTHORIZATION regress_testrolx;-CREATE SCHEMA IF NOT EXISTS newschema5 AUTHORIZATION "Public";+CREATE SCHEMA IF NOT EXISTS newschema3 AUTHORIZATION CURRENT_ROLE;+CREATE SCHEMA IF NOT EXISTS newschema4 AUTHORIZATION SESSION_USER;+CREATE SCHEMA IF NOT EXISTS newschema5 AUTHORIZATION regress_testrolx;+CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION "Public";-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION USER; -- error-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION CURRENT_ROLE; -- error-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION PUBLIC; -- error-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION "public"; -- error-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION NONE; -- error-CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION nonexistent; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION USER; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION PUBLIC; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION "public"; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION NONE; -- error+CREATE SCHEMA IF NOT EXISTS newschemax AUTHORIZATION nonexistent; -- error
SELECT n.nspname, r.rolname FROM pg_namespace n
JOIN pg_roles r ON (r.oid = n.nspowner)
@@ -230,6 +244,7 @@ CREATE TABLE testtab3 (a int);
CREATE TABLE testtab4 (a int);
CREATE TABLE testtab5 (a int);
CREATE TABLE testtab6 (a int);
+CREATE TABLE testtab7 (a int);
\c -
SET SESSION AUTHORIZATION regress_testrol1;
@@ -237,15 +252,15 @@ CREATE TABLE testtab6 (a int);
ALTER TABLE testtab1 OWNER TO CURRENT_USER;
ALTER TABLE testtab2 OWNER TO "current_user";
-ALTER TABLE testtab3 OWNER TO SESSION_USER;-ALTER TABLE testtab4 OWNER TO regress_testrolx;-ALTER TABLE testtab5 OWNER TO "Public";+ALTER TABLE testtab3 OWNER TO CURRENT_ROLE;+ALTER TABLE testtab4 OWNER TO SESSION_USER;+ALTER TABLE testtab5 OWNER TO regress_testrolx;+ALTER TABLE testtab6 OWNER TO "Public";-ALTER TABLE testtab6 OWNER TO CURRENT_ROLE; -- error-ALTER TABLE testtab6 OWNER TO USER; --error-ALTER TABLE testtab6 OWNER TO PUBLIC; -- error-ALTER TABLE testtab6 OWNER TO "public"; -- error-ALTER TABLE testtab6 OWNER TO nonexistent; -- error+ALTER TABLE testtab7 OWNER TO USER; --error+ALTER TABLE testtab7 OWNER TO PUBLIC; -- error+ALTER TABLE testtab7 OWNER TO "public"; -- error+ALTER TABLE testtab7 OWNER TO nonexistent; -- error
SELECT c.relname, r.rolname
FROM pg_class c JOIN pg_roles r ON (r.oid = c.relowner)
@@ -267,6 +282,7 @@ CREATE AGGREGATE testagg6(int2) (SFUNC = int2_sum, STYPE = int8);
CREATE AGGREGATE testagg7(int2) (SFUNC = int2_sum, STYPE = int8);
CREATE AGGREGATE testagg8(int2) (SFUNC = int2_sum, STYPE = int8);
CREATE AGGREGATE testagg9(int2) (SFUNC = int2_sum, STYPE = int8);
+CREATE AGGREGATE testagga(int2) (SFUNC = int2_sum, STYPE = int8);
\c -
SET SESSION AUTHORIZATION regress_testrol1;
@@ -274,15 +290,15 @@ CREATE AGGREGATE testagg9(int2) (SFUNC = int2_sum, STYPE = int8);
ALTER AGGREGATE testagg1(int2) OWNER TO CURRENT_USER;
ALTER AGGREGATE testagg2(int2) OWNER TO "current_user";
-ALTER AGGREGATE testagg3(int2) OWNER TO SESSION_USER;-ALTER AGGREGATE testagg4(int2) OWNER TO regress_testrolx;-ALTER AGGREGATE testagg5(int2) OWNER TO "Public";+ALTER AGGREGATE testagg3(int2) OWNER TO CURRENT_ROLE;+ALTER AGGREGATE testagg4(int2) OWNER TO SESSION_USER;+ALTER AGGREGATE testagg5(int2) OWNER TO regress_testrolx;+ALTER AGGREGATE testagg6(int2) OWNER TO "Public";-ALTER AGGREGATE testagg5(int2) OWNER TO CURRENT_ROLE; -- error-ALTER AGGREGATE testagg5(int2) OWNER TO USER; -- error-ALTER AGGREGATE testagg5(int2) OWNER TO PUBLIC; -- error-ALTER AGGREGATE testagg5(int2) OWNER TO "public"; -- error-ALTER AGGREGATE testagg5(int2) OWNER TO nonexistent; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO USER; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO PUBLIC; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO "public"; -- error+ALTER AGGREGATE testagg6(int2) OWNER TO nonexistent; -- error
SELECT p.proname, r.rolname
FROM pg_proc p JOIN pg_roles r ON (r.oid = p.proowner)
@@ -300,20 +316,19 @@ CREATE SERVER sv6 FOREIGN DATA WRAPPER test_wrapper;
CREATE SERVER sv7 FOREIGN DATA WRAPPER test_wrapper;
CREATE SERVER sv8 FOREIGN DATA WRAPPER test_wrapper;
CREATE SERVER sv9 FOREIGN DATA WRAPPER test_wrapper;
+CREATE SERVER sv10 FOREIGN DATA WRAPPER test_wrapper;
CREATE USER MAPPING FOR CURRENT_USER SERVER sv1 OPTIONS (user 'CURRENT_USER');
CREATE USER MAPPING FOR "current_user" SERVER sv2 OPTIONS (user '"current_user"');
-CREATE USER MAPPING FOR USER SERVER sv3 OPTIONS (user 'USER');-CREATE USER MAPPING FOR "user" SERVER sv4 OPTIONS (user '"USER"');-CREATE USER MAPPING FOR SESSION_USER SERVER sv5 OPTIONS (user 'SESSION_USER');-CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');-CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');-CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');--CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9- OPTIONS (user 'CURRENT_ROLE'); -- error-CREATE USER MAPPING FOR nonexistent SERVER sv9- OPTIONS (user 'nonexistent'); -- error;+CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv3 OPTIONS (user 'CURRENT_ROLE');+CREATE USER MAPPING FOR USER SERVER sv4 OPTIONS (user 'USER');+CREATE USER MAPPING FOR "user" SERVER sv5 OPTIONS (user '"USER"');+CREATE USER MAPPING FOR SESSION_USER SERVER sv6 OPTIONS (user 'SESSION_USER');+CREATE USER MAPPING FOR PUBLIC SERVER sv7 OPTIONS (user 'PUBLIC');+CREATE USER MAPPING FOR "Public" SERVER sv8 OPTIONS (user '"Public"');+CREATE USER MAPPING FOR regress_testrolx SERVER sv9 OPTIONS (user 'regress_testrolx');++CREATE USER MAPPING FOR nonexistent SERVER sv10 OPTIONS (user 'nonexistent'); -- error;
SELECT * FROM chkumapping();
@@ -322,22 +337,22 @@ CREATE USER MAPPING FOR nonexistent SERVER sv9
OPTIONS (SET user 'CURRENT_USER_alt');
ALTER USER MAPPING FOR "current_user" SERVER sv2
OPTIONS (SET user '"current_user"_alt');
-ALTER USER MAPPING FOR USER SERVER sv3+ALTER USER MAPPING FOR CURRENT_ROLE SERVER sv3+ OPTIONS (SET user 'CURRENT_ROLE_alt');+ALTER USER MAPPING FOR USER SERVER sv4
OPTIONS (SET user 'USER_alt');
-ALTER USER MAPPING FOR "user" SERVER sv4+ALTER USER MAPPING FOR "user" SERVER sv5
OPTIONS (SET user '"user"_alt');
-ALTER USER MAPPING FOR SESSION_USER SERVER sv5+ALTER USER MAPPING FOR SESSION_USER SERVER sv6
OPTIONS (SET user 'SESSION_USER_alt');
-ALTER USER MAPPING FOR PUBLIC SERVER sv6+ALTER USER MAPPING FOR PUBLIC SERVER sv7
OPTIONS (SET user 'public_alt');
-ALTER USER MAPPING FOR "Public" SERVER sv7+ALTER USER MAPPING FOR "Public" SERVER sv8
OPTIONS (SET user '"Public"_alt');
-ALTER USER MAPPING FOR regress_testrolx SERVER sv8+ALTER USER MAPPING FOR regress_testrolx SERVER sv9
OPTIONS (SET user 'regress_testrolx_alt');
-ALTER USER MAPPING FOR CURRENT_ROLE SERVER sv9- OPTIONS (SET user 'CURRENT_ROLE_alt');-ALTER USER MAPPING FOR nonexistent SERVER sv9+ALTER USER MAPPING FOR nonexistent SERVER sv10
OPTIONS (SET user 'nonexistent_alt'); -- error
SELECT * FROM chkumapping();
@@ -345,25 +360,26 @@ CREATE USER MAPPING FOR nonexistent SERVER sv9
-- DROP USER MAPPING
DROP USER MAPPING FOR CURRENT_USER SERVER sv1;
DROP USER MAPPING FOR "current_user" SERVER sv2;
-DROP USER MAPPING FOR USER SERVER sv3;-DROP USER MAPPING FOR "user" SERVER sv4;-DROP USER MAPPING FOR SESSION_USER SERVER sv5;-DROP USER MAPPING FOR PUBLIC SERVER sv6;-DROP USER MAPPING FOR "Public" SERVER sv7;-DROP USER MAPPING FOR regress_testrolx SERVER sv8;--DROP USER MAPPING FOR CURRENT_ROLE SERVER sv9; -- error-DROP USER MAPPING FOR nonexistent SERVER sv; -- error+DROP USER MAPPING FOR CURRENT_ROLE SERVER sv3;+DROP USER MAPPING FOR USER SERVER sv4;+DROP USER MAPPING FOR "user" SERVER sv5;+DROP USER MAPPING FOR SESSION_USER SERVER sv6;+DROP USER MAPPING FOR PUBLIC SERVER sv7;+DROP USER MAPPING FOR "Public" SERVER sv8;+DROP USER MAPPING FOR regress_testrolx SERVER sv9;++DROP USER MAPPING FOR nonexistent SERVER sv10; -- error
SELECT * FROM chkumapping();
CREATE USER MAPPING FOR CURRENT_USER SERVER sv1 OPTIONS (user 'CURRENT_USER');
CREATE USER MAPPING FOR "current_user" SERVER sv2 OPTIONS (user '"current_user"');
-CREATE USER MAPPING FOR USER SERVER sv3 OPTIONS (user 'USER');-CREATE USER MAPPING FOR "user" SERVER sv4 OPTIONS (user '"USER"');-CREATE USER MAPPING FOR SESSION_USER SERVER sv5 OPTIONS (user 'SESSION_USER');-CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');-CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');-CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');+CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv3 OPTIONS (user 'CURRENT_ROLE');+CREATE USER MAPPING FOR USER SERVER sv4 OPTIONS (user 'USER');+CREATE USER MAPPING FOR "user" SERVER sv5 OPTIONS (user '"USER"');+CREATE USER MAPPING FOR SESSION_USER SERVER sv6 OPTIONS (user 'SESSION_USER');+CREATE USER MAPPING FOR PUBLIC SERVER sv7 OPTIONS (user 'PUBLIC');+CREATE USER MAPPING FOR "Public" SERVER sv8 OPTIONS (user '"Public"');+CREATE USER MAPPING FOR regress_testrolx SERVER sv9 OPTIONS (user 'regress_testrolx');
SELECT * FROM chkumapping();
-- DROP USER MAPPING IF EXISTS
@@ -371,21 +387,22 @@ CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testr
SELECT * FROM chkumapping();
DROP USER MAPPING IF EXISTS FOR "current_user" SERVER sv2;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR USER SERVER sv3;+DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER sv3;+SELECT * FROM chkumapping();+DROP USER MAPPING IF EXISTS FOR USER SERVER sv4;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR "user" SERVER sv4;+DROP USER MAPPING IF EXISTS FOR "user" SERVER sv5;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR SESSION_USER SERVER sv5;+DROP USER MAPPING IF EXISTS FOR SESSION_USER SERVER sv6;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR PUBLIC SERVER sv6;+DROP USER MAPPING IF EXISTS FOR PUBLIC SERVER sv7;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR "Public" SERVER sv7;+DROP USER MAPPING IF EXISTS FOR "Public" SERVER sv8;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR regress_testrolx SERVER sv8;+DROP USER MAPPING IF EXISTS FOR regress_testrolx SERVER sv9;
SELECT * FROM chkumapping();
-DROP USER MAPPING IF EXISTS FOR CURRENT_ROLE SERVER sv9; --error-DROP USER MAPPING IF EXISTS FOR nonexistent SERVER sv9; -- error+DROP USER MAPPING IF EXISTS FOR nonexistent SERVER sv10; -- error
-- GRANT/REVOKE
GRANT regress_testrol0 TO pg_signal_backend; -- success
@@ -410,38 +427,38 @@ CREATE SCHEMA test_roles_schema AUTHORIZATION pg_signal_backend; --success
GRANT ALL PRIVILEGES ON FUNCTION testagg1(int2) TO PUBLIC;
GRANT ALL PRIVILEGES ON FUNCTION testagg2(int2) TO CURRENT_USER;
GRANT ALL PRIVILEGES ON FUNCTION testagg3(int2) TO "current_user";
-GRANT ALL PRIVILEGES ON FUNCTION testagg4(int2) TO SESSION_USER;-GRANT ALL PRIVILEGES ON FUNCTION testagg5(int2) TO "Public";-GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx;-GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public";-GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2)+GRANT ALL PRIVILEGES ON FUNCTION testagg4(int2) TO CURRENT_ROLE;+GRANT ALL PRIVILEGES ON FUNCTION testagg5(int2) TO SESSION_USER;+GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO "Public";+GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO regress_testrolx;+GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2) TO "public";+GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2)
TO current_user, public, regress_testrolx;
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO CURRENT_ROLE; --error-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO USER; --error-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO NONE; --error-GRANT ALL PRIVILEGES ON FUNCTION testagg9(int2) TO "none"; --error+GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO USER; --error+GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO NONE; --error+GRANT ALL PRIVILEGES ON FUNCTION testagga(int2) TO "none"; --error
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
REVOKE ALL PRIVILEGES ON FUNCTION testagg1(int2) FROM PUBLIC;
REVOKE ALL PRIVILEGES ON FUNCTION testagg2(int2) FROM CURRENT_USER;
REVOKE ALL PRIVILEGES ON FUNCTION testagg3(int2) FROM "current_user";
-REVOKE ALL PRIVILEGES ON FUNCTION testagg4(int2) FROM SESSION_USER;-REVOKE ALL PRIVILEGES ON FUNCTION testagg5(int2) FROM "Public";-REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx;-REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public";-REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2)+REVOKE ALL PRIVILEGES ON FUNCTION testagg4(int2) FROM CURRENT_ROLE;+REVOKE ALL PRIVILEGES ON FUNCTION testagg5(int2) FROM SESSION_USER;+REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM "Public";+REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM regress_testrolx;+REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2) FROM "public";+REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2)
FROM current_user, public, regress_testrolx;
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM CURRENT_ROLE; --error-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM USER; --error-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM NONE; --error-REVOKE ALL PRIVILEGES ON FUNCTION testagg9(int2) FROM "none"; --error+REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM USER; --error+REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM NONE; --error+REVOKE ALL PRIVILEGES ON FUNCTION testagga(int2) FROM "none"; --error
SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
--
2.28.0
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients from your mail client; the link fills in
the headers below: reply via email
Some clients, webmail especially, drop In-Reply-To and References from
a link, and the reply then starts a new thread: use the mbox below.
To: pgsql-hackers@postgresql.org
Cc: peter.eisentraut@2ndquadrant.com, alvherre@2ndquadrant.com
Subject: Re: Allow CURRENT_ROLE in GRANTED BY
In-Reply-To: <cc12f3fc-9fb1-71dc-1b51-1edf65f9e5c2@2ndquadrant.com>
References: <20200624210831.GA7173@alvherre.pgsql> <13369949-9e86-9214-8952-a74befaea41d@2ndquadrant.com> <cc12f3fc-9fb1-71dc-1b51-1edf65f9e5c2@2ndquadrant.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox