1 files changed, 45 insertions, 45 deletions

diff --git a/src/test/regress/sql/dependency.sql b/src/test/regress/sql/dependency.sql
index 599a359b4f..f5c45e4666 100644
--- a/src/test/regress/sql/dependency.sql
+++ b/src/test/regress/sql/dependency.sql
@@ -2,85 +2,85 @@
 -- DEPENDENCIES
 --
 
-CREATE USER regression_user;
-CREATE USER regression_user2;
-CREATE USER regression_user3;
-CREATE GROUP regression_group;
+CREATE USER regress_dep_user;
+CREATE USER regress_dep_user2;
+CREATE USER regress_dep_user3;
+CREATE GROUP regress_dep_group;
 
 CREATE TABLE deptest (f1 serial primary key, f2 text);
 
-GRANT SELECT ON TABLE deptest TO GROUP regression_group;
-GRANT ALL ON TABLE deptest TO regression_user, regression_user2;
+GRANT SELECT ON TABLE deptest TO GROUP regress_dep_group;
+GRANT ALL ON TABLE deptest TO regress_dep_user, regress_dep_user2;
 
 -- can't drop neither because they have privileges somewhere
-DROP USER regression_user;
-DROP GROUP regression_group;
+DROP USER regress_dep_user;
+DROP GROUP regress_dep_group;
 
 -- if we revoke the privileges we can drop the group
-REVOKE SELECT ON deptest FROM GROUP regression_group;
-DROP GROUP regression_group;
+REVOKE SELECT ON deptest FROM GROUP regress_dep_group;
+DROP GROUP regress_dep_group;
 
 -- can't drop the user if we revoke the privileges partially
-REVOKE SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES ON deptest FROM regression_user;
-DROP USER regression_user;
+REVOKE SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES ON deptest FROM regress_dep_user;
+DROP USER regress_dep_user;
 
 -- now we are OK to drop him
-REVOKE TRIGGER ON deptest FROM regression_user;
-DROP USER regression_user;
+REVOKE TRIGGER ON deptest FROM regress_dep_user;
+DROP USER regress_dep_user;
 
 -- we are OK too if we drop the privileges all at once
-REVOKE ALL ON deptest FROM regression_user2;
-DROP USER regression_user2;
+REVOKE ALL ON deptest FROM regress_dep_user2;
+DROP USER regress_dep_user2;
 
 -- can't drop the owner of an object
 -- the error message detail here would include a pg_toast_nnn name that
 -- is not constant, so suppress it
 \set VERBOSITY terse
-ALTER TABLE deptest OWNER TO regression_user3;
-DROP USER regression_user3;
+ALTER TABLE deptest OWNER TO regress_dep_user3;
+DROP USER regress_dep_user3;
 
 \set VERBOSITY default
 -- if we drop the object, we can drop the user too
 DROP TABLE deptest;
-DROP USER regression_user3;
+DROP USER regress_dep_user3;
 
 -- Test DROP OWNED
-CREATE USER regression_user0;
-CREATE USER regression_user1;
-CREATE USER regression_user2;
-SET SESSION AUTHORIZATION regression_user0;
+CREATE USER regress_dep_user0;
+CREATE USER regress_dep_user1;
+CREATE USER regress_dep_user2;
+SET SESSION AUTHORIZATION regress_dep_user0;
 -- permission denied
-DROP OWNED BY regression_user1;
-DROP OWNED BY regression_user0, regression_user2;
-REASSIGN OWNED BY regression_user0 TO regression_user1;
-REASSIGN OWNED BY regression_user1 TO regression_user0;
+DROP OWNED BY regress_dep_user1;
+DROP OWNED BY regress_dep_user0, regress_dep_user2;
+REASSIGN OWNED BY regress_dep_user0 TO regress_dep_user1;
+REASSIGN OWNED BY regress_dep_user1 TO regress_dep_user0;
 -- this one is allowed
-DROP OWNED BY regression_user0;
+DROP OWNED BY regress_dep_user0;
 
 CREATE TABLE deptest1 (f1 int unique);
-GRANT ALL ON deptest1 TO regression_user1 WITH GRANT OPTION;
+GRANT ALL ON deptest1 TO regress_dep_user1 WITH GRANT OPTION;
 
-SET SESSION AUTHORIZATION regression_user1;
+SET SESSION AUTHORIZATION regress_dep_user1;
 CREATE TABLE deptest (a serial primary key, b text);
-GRANT ALL ON deptest1 TO regression_user2;
+GRANT ALL ON deptest1 TO regress_dep_user2;
 RESET SESSION AUTHORIZATION;
 \z deptest1
 
-DROP OWNED BY regression_user1;
+DROP OWNED BY regress_dep_user1;
 -- all grants revoked
 \z deptest1
 -- table was dropped
 \d deptest
 
 -- Test REASSIGN OWNED
-GRANT ALL ON deptest1 TO regression_user1;
-GRANT CREATE ON DATABASE regression TO regression_user1;
+GRANT ALL ON deptest1 TO regress_dep_user1;
+GRANT CREATE ON DATABASE regression TO regress_dep_user1;
 
-SET SESSION AUTHORIZATION regression_user1;
+SET SESSION AUTHORIZATION regress_dep_user1;
 CREATE SCHEMA deptest;
 CREATE TABLE deptest (a serial primary key, b text);
-ALTER DEFAULT PRIVILEGES FOR ROLE regression_user1 IN SCHEMA deptest
-  GRANT ALL ON TABLES TO regression_user2;
+ALTER DEFAULT PRIVILEGES FOR ROLE regress_dep_user1 IN SCHEMA deptest
+  GRANT ALL ON TABLES TO regress_dep_user2;
 CREATE FUNCTION deptest_func() RETURNS void LANGUAGE plpgsql
   AS $$ BEGIN END; $$;
 CREATE TYPE deptest_enum AS ENUM ('red');
@@ -99,19 +99,19 @@ SELECT typowner = relowner
 FROM pg_type JOIN pg_class c ON typrelid = c.oid WHERE typname = 'deptest_t';
 
 RESET SESSION AUTHORIZATION;
-REASSIGN OWNED BY regression_user1 TO regression_user2;
+REASSIGN OWNED BY regress_dep_user1 TO regress_dep_user2;
 \dt deptest
 
 SELECT typowner = relowner
 FROM pg_type JOIN pg_class c ON typrelid = c.oid WHERE typname = 'deptest_t';
 
 -- doesn't work: grant still exists
-DROP USER regression_user1;
-DROP OWNED BY regression_user1;
-DROP USER regression_user1;
+DROP USER regress_dep_user1;
+DROP OWNED BY regress_dep_user1;
+DROP USER regress_dep_user1;
 
 \set VERBOSITY terse
-DROP USER regression_user2;
-DROP OWNED BY regression_user2, regression_user0;
-DROP USER regression_user2;
-DROP USER regression_user0;
+DROP USER regress_dep_user2;
+DROP OWNED BY regress_dep_user2, regress_dep_user0;
+DROP USER regress_dep_user2;
+DROP USER regress_dep_user0;