From f7c53bb9e309cfea3206f4ed44b38eb2bd1cf726 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 8 Sep 2021 17:02:18 +0200 Subject: [PATCH] Consistently use "superuser" instead of "super user" The correct nomenclature for the highest privileged user is superuser and not "super user", this replaces the few instances where that was used erroneously. No user-visible changes are done as all changes are in comments, so no back-patching. Author: Bharath Rupireddy Discussion: https://postgr.es/m/CALj2ACW3snGBD8BAQiArMDS1Y43LuX3ymwO+N8aUg1Hrv6hYNw@mail.gmail.com --- src/backend/commands/amcmds.c | 2 +- src/backend/commands/foreigncmds.c | 4 ++-- src/backend/commands/tablespace.c | 2 +- src/test/regress/expected/conversion.out | 2 +- src/test/regress/sql/conversion.sql | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/amcmds.c b/src/backend/commands/amcmds.c index 188109e474..72e209a8b0 100644 --- a/src/backend/commands/amcmds.c +++ b/src/backend/commands/amcmds.c @@ -53,7 +53,7 @@ CreateAccessMethod(CreateAmStmt *stmt) rel = table_open(AccessMethodRelationId, RowExclusiveLock); - /* Must be super user */ + /* Must be superuser */ if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 9b71beb1d3..146fa5733f 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -573,7 +573,7 @@ CreateForeignDataWrapper(ParseState *pstate, CreateFdwStmt *stmt) rel = table_open(ForeignDataWrapperRelationId, RowExclusiveLock); - /* Must be super user */ + /* Must be superuser */ if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), @@ -690,7 +690,7 @@ AlterForeignDataWrapper(ParseState *pstate, AlterFdwStmt *stmt) rel = table_open(ForeignDataWrapperRelationId, RowExclusiveLock); - /* Must be super user */ + /* Must be superuser */ if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 932e7ae37b..4b96eec9df 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -242,7 +242,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt) Oid ownerId; Datum newOptions; - /* Must be super user */ + /* Must be superuser */ if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), diff --git a/src/test/regress/expected/conversion.out b/src/test/regress/expected/conversion.out index 04fdcba496..5c9d631755 100644 --- a/src/test/regress/expected/conversion.out +++ b/src/test/regress/expected/conversion.out @@ -33,7 +33,7 @@ DROP CONVERSION mydef; -- so there's no need to do that here. -- -- --- return to the super user +-- return to the superuser -- RESET SESSION AUTHORIZATION; DROP USER regress_conversion_user; diff --git a/src/test/regress/sql/conversion.sql b/src/test/regress/sql/conversion.sql index 8358682432..5576999e42 100644 --- a/src/test/regress/sql/conversion.sql +++ b/src/test/regress/sql/conversion.sql @@ -30,7 +30,7 @@ DROP CONVERSION mydef; -- so there's no need to do that here. -- -- --- return to the super user +-- return to the superuser -- RESET SESSION AUTHORIZATION; DROP USER regress_conversion_user; -- 2.39.5