0001-Fix-role-names-in-regression-test-in-module-test_pg_.patch

application/octet-stream

Filename: 0001-Fix-role-names-in-regression-test-in-module-test_pg_.patch
Type: application/octet-stream
Part: 0
Message: Re: Allow placeholders in ALTER ROLE w/o superuser

Patch

Same data as JSON: GET /api/v1/attachments/:id/patch the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes. API reference →
Format: format-patch
Series: patch 0001
Subject: Fix role names in regression test in module test_pg_db_role_setting
File+
src/test/modules/test_pg_db_role_setting/expected/test_pg_db_role_setting.out 38 38
src/test/modules/test_pg_db_role_setting/sql/test_pg_db_role_setting.sql 21 21
From 43f184b5c308436bbdce29eaf8e5e8c232fa6d89 Mon Sep 17 00:00:00 2001
From: Pavel Borisov <pashkin.elfe@gmail.com>
Date: Fri, 9 Dec 2022 15:02:41 +0400
Subject: [PATCH] Fix role names in regression test in module
 test_pg_db_role_setting

Buildfarm members sifaka and longfin were unhappy that role names
in regression tests didn't start with "regress_". The fix is just
regexp replace in test sql and results.
---
 .../expected/test_pg_db_role_setting.out      | 76 +++++++++----------
 .../sql/test_pg_db_role_setting.sql           | 42 +++++-----
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/test/modules/test_pg_db_role_setting/expected/test_pg_db_role_setting.out b/src/test/modules/test_pg_db_role_setting/expected/test_pg_db_role_setting.out
index 4da17dca28c..bee237cf40b 100644
--- a/src/test/modules/test_pg_db_role_setting/expected/test_pg_db_role_setting.out
+++ b/src/test/modules/test_pg_db_role_setting/expected/test_pg_db_role_setting.out
@@ -1,7 +1,7 @@
 CREATE EXTENSION test_pg_db_role_setting;
-CREATE USER super_user SUPERUSER;
-CREATE USER regular_user;
-\c - regular_user
+CREATE USER regress_super_user SUPERUSER;
+CREATE USER regress_regular_user;
+\c - regress_regular_user
 -- successfully set a placeholder value
 SET test_pg_db_role_setting.superuser_param = 'aaa';
 -- module is loaded, the placeholder value is thrown away
@@ -24,24 +24,24 @@ SHOW test_pg_db_role_setting.user_param;
  user_param_value
 (1 row)
 
-\c - regular_user
+\c - regress_regular_user
 -- fail, not privileges
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
 ERROR:  permission denied to set parameter "test_pg_db_role_setting.superuser_param"
-ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb';
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb';
 ERROR:  permission denied to set parameter "test_pg_db_role_setting.user_param"
 -- success for USER SET parameters
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
-ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
-\drds regular_user
-                                 List of settings
-     Role     | Database |                  Settings                   | User set 
---------------+----------+---------------------------------------------+----------
- regular_user |          | test_pg_db_role_setting.superuser_param=aaa+| t       +
-              |          | test_pg_db_role_setting.user_param=bbb      | t
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
+\drds regress_regular_user
+                                     List of settings
+         Role         | Database |                  Settings                   | User set 
+----------------------+----------+---------------------------------------------+----------
+ regress_regular_user |          | test_pg_db_role_setting.superuser_param=aaa+| t       +
+                      |          | test_pg_db_role_setting.user_param=bbb      | t
 (1 row)
 
-\c - regular_user
+\c - regress_regular_user
 -- successfully set placeholders
 SHOW test_pg_db_role_setting.superuser_param;
  test_pg_db_role_setting.superuser_param 
@@ -75,21 +75,21 @@ SHOW test_pg_db_role_setting.user_param;
  bbb
 (1 row)
 
-\c - super_user
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
-\drds regular_user
-                                 List of settings
-     Role     | Database |                  Settings                   | User set 
---------------+----------+---------------------------------------------+----------
- regular_user |          | test_pg_db_role_setting.superuser_param=aaa+| f       +
-              |          | test_pg_db_role_setting.user_param=bbb      | t
+\c - regress_super_user
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
+\drds regress_regular_user
+                                     List of settings
+         Role         | Database |                  Settings                   | User set 
+----------------------+----------+---------------------------------------------+----------
+ regress_regular_user |          | test_pg_db_role_setting.superuser_param=aaa+| f       +
+                      |          | test_pg_db_role_setting.user_param=bbb      | t
 (1 row)
 
-\c - regular_user
+\c - regress_regular_user
 -- don't have a priviledge to change superuser value to user set one
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
 ERROR:  permission denied to set parameter "test_pg_db_role_setting.superuser_param"
-\c - super_user
+\c - regress_super_user
 SELECT load_test_pg_db_role_setting();
  load_test_pg_db_role_setting 
 ------------------------------
@@ -97,18 +97,18 @@ SELECT load_test_pg_db_role_setting();
 (1 row)
 
 -- give the privilege to set SUSET param to the regular user
-GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regular_user;
-\c - regular_user
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
-\drds regular_user
-                                 List of settings
-     Role     | Database |                  Settings                   | User set 
---------------+----------+---------------------------------------------+----------
- regular_user |          | test_pg_db_role_setting.superuser_param=ccc+| f       +
-              |          | test_pg_db_role_setting.user_param=bbb      | t
-(1 row)
-
-\c - regular_user
+GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regress_regular_user;
+\c - regress_regular_user
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
+\drds regress_regular_user
+                                     List of settings
+         Role         | Database |                  Settings                   | User set 
+----------------------+----------+---------------------------------------------+----------
+ regress_regular_user |          | test_pg_db_role_setting.superuser_param=ccc+| f       +
+                      |          | test_pg_db_role_setting.user_param=bbb      | t
+(1 row)
+
+\c - regress_regular_user
 -- successfully set placeholders
 SHOW test_pg_db_role_setting.superuser_param;
  test_pg_db_role_setting.superuser_param 
diff --git a/src/test/modules/test_pg_db_role_setting/sql/test_pg_db_role_setting.sql b/src/test/modules/test_pg_db_role_setting/sql/test_pg_db_role_setting.sql
index cb6eb0448e3..c6095dfa98c 100644
--- a/src/test/modules/test_pg_db_role_setting/sql/test_pg_db_role_setting.sql
+++ b/src/test/modules/test_pg_db_role_setting/sql/test_pg_db_role_setting.sql
@@ -1,8 +1,8 @@
 CREATE EXTENSION test_pg_db_role_setting;
-CREATE USER super_user SUPERUSER;
-CREATE USER regular_user;
+CREATE USER regress_super_user SUPERUSER;
+CREATE USER regress_regular_user;
 
-\c - regular_user
+\c - regress_regular_user
 -- successfully set a placeholder value
 SET test_pg_db_role_setting.superuser_param = 'aaa';
 
@@ -12,17 +12,17 @@ SELECT load_test_pg_db_role_setting();
 SHOW test_pg_db_role_setting.superuser_param;
 SHOW test_pg_db_role_setting.user_param;
 
-\c - regular_user
+\c - regress_regular_user
 -- fail, not privileges
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
-ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb';
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb';
 -- success for USER SET parameters
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
-ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
 
-\drds regular_user
+\drds regress_regular_user
 
-\c - regular_user
+\c - regress_regular_user
 -- successfully set placeholders
 SHOW test_pg_db_role_setting.superuser_param;
 SHOW test_pg_db_role_setting.user_param;
@@ -33,25 +33,25 @@ SELECT load_test_pg_db_role_setting();
 SHOW test_pg_db_role_setting.superuser_param;
 SHOW test_pg_db_role_setting.user_param;
 
-\c - super_user
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
-\drds regular_user
+\c - regress_super_user
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
+\drds regress_regular_user
 
-\c - regular_user
+\c - regress_regular_user
 -- don't have a priviledge to change superuser value to user set one
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
 
-\c - super_user
+\c - regress_super_user
 SELECT load_test_pg_db_role_setting();
 -- give the privilege to set SUSET param to the regular user
-GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regular_user;
+GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regress_regular_user;
 
-\c - regular_user
-ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
+\c - regress_regular_user
+ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
 
-\drds regular_user
+\drds regress_regular_user
 
-\c - regular_user
+\c - regress_regular_user
 -- successfully set placeholders
 SHOW test_pg_db_role_setting.superuser_param;
 SHOW test_pg_db_role_setting.user_param;
-- 
2.24.3 (Apple Git-128)