rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Un-hide most cascaded-drop details in regression test results. 

Now that the ordering of DROP messages ought to be stable everywhere,
we should not need these kluges of hiding DETAIL output just to avoid
unstable ordering.  Hiding it's not great for test coverage, so
let's undo that where possible.

In a small number of places, it's necessary to leave it in, for
example because the output might include a variable pg_temp_nnn
schema name.  I also left things alone in places where the details
would depend on other regression test scripts, e.g. plpython_drop.sql.

Perhaps buildfarm experience will show this to be a bad idea,
but if so I'd like to know why.

Discussion: https://postgr.es/m/E1h6eep-0001Mw-Vd@gemulon.postgresql.org
This commit is contained in:
Tom Lane 2019-03-24 19:15:37 -04:00
parent af6550d344
commit 940311e4bb
39 changed files with 313 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/test/regress/expected/alter_generic.out
View File

@ -679,7 +679,6 @@ SELECT nspname, prsname
---
--- Cleanup resources
---
\set VERBOSITY terse \\ -- suppress cascade details
DROP FOREIGN DATA WRAPPER alt_fdw2 CASCADE;
NOTICE: drop cascades to server alt_fserv2
DROP FOREIGN DATA WRAPPER alt_fdw3 CASCADE;
@ -688,8 +687,45 @@ DROP LANGUAGE alt_lang2 CASCADE;
DROP LANGUAGE alt_lang3 CASCADE;
DROP SCHEMA alt_nsp1 CASCADE;
NOTICE: drop cascades to 28 other objects
DETAIL: drop cascades to function alt_func3(integer)
drop cascades to function alt_agg3(integer)
drop cascades to function alt_func4(integer)
drop cascades to function alt_func2(integer)
drop cascades to function alt_agg4(integer)
drop cascades to function alt_agg2(integer)
drop cascades to conversion alt_conv3
drop cascades to conversion alt_conv4
drop cascades to conversion alt_conv2
drop cascades to operator @+@(integer,integer)
drop cascades to operator @-@(integer,integer)
drop cascades to operator family alt_opf3 for access method hash
drop cascades to operator family alt_opc1 for access method hash
drop cascades to operator family alt_opc2 for access method hash
drop cascades to operator family alt_opf4 for access method hash
drop cascades to operator family alt_opf2 for access method hash
drop cascades to table alt_regress_1
drop cascades to table alt_regress_2
drop cascades to text search dictionary alt_ts_dict3
drop cascades to text search dictionary alt_ts_dict4
drop cascades to text search dictionary alt_ts_dict2
drop cascades to text search configuration alt_ts_conf3
drop cascades to text search configuration alt_ts_conf4
drop cascades to text search configuration alt_ts_conf2
drop cascades to text search template alt_ts_temp3
drop cascades to text search template alt_ts_temp2
drop cascades to text search parser alt_ts_prs3
drop cascades to text search parser alt_ts_prs2
DROP SCHEMA alt_nsp2 CASCADE;
NOTICE: drop cascades to 9 other objects
DETAIL: drop cascades to function alt_nsp2.alt_func2(integer)
drop cascades to function alt_nsp2.alt_agg2(integer)
drop cascades to conversion alt_nsp2.alt_conv2
drop cascades to operator alt_nsp2.@-@(integer,integer)
drop cascades to operator family alt_nsp2.alt_opf2 for access method hash
drop cascades to text search dictionary alt_nsp2.alt_ts_dict2
drop cascades to text search configuration alt_nsp2.alt_ts_conf2
drop cascades to text search template alt_nsp2.alt_ts_temp2
drop cascades to text search parser alt_nsp2.alt_ts_prs2
DROP USER regress_alter_generic_user1;
DROP USER regress_alter_generic_user2;
DROP USER regress_alter_generic_user3;

18
src/test/regress/expected/collate.out
View File

@ -681,6 +681,22 @@ SELECT collation for ((SELECT b FROM collate_test1 LIMIT 1));
-- trying to run any platform-specific collation tests later, so we
-- must get rid of them.
--
\set VERBOSITY terse
DROP SCHEMA collate_tests CASCADE;
NOTICE: drop cascades to 17 other objects
DETAIL: drop cascades to table collate_test1
drop cascades to table collate_test_like
drop cascades to table collate_test2
drop cascades to type testdomain_p
drop cascades to table collate_test4
drop cascades to table collate_test5
drop cascades to table collate_test10
drop cascades to view collview1
drop cascades to view collview2
drop cascades to view collview3
drop cascades to type testdomain
drop cascades to function dup(anyelement)
drop cascades to table collate_test20
drop cascades to table collate_test21
drop cascades to table collate_test22
drop cascades to collation mycoll2
drop cascades to table collate_test23

23
src/test/regress/expected/create_function_3.out
View File

@ -341,9 +341,28 @@ SELECT * FROM voidtest5(3);
(0 rows)
-- Cleanup
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA temp_func_test CASCADE;
NOTICE: drop cascades to 21 other objects
\set VERBOSITY default
DETAIL: drop cascades to function functest_a_1(text,date)
drop cascades to function functest_a_2(text[])
drop cascades to function functest_a_3()
drop cascades to function functest_b_2(integer)
drop cascades to function functest_b_3(integer)
drop cascades to function functest_b_4(integer)
drop cascades to function functest_c_1(integer)
drop cascades to function functest_c_2(integer)
drop cascades to function functest_c_3(integer)
drop cascades to function functest_e_1(integer)
drop cascades to function functest_e_2(integer)
drop cascades to function functest_f_1(integer)
drop cascades to function functest_f_2(integer)
drop cascades to function functest_f_3(integer)
drop cascades to function functest_f_4(integer)
drop cascades to function functest_b_2(bigint)
drop cascades to function voidtest1(integer)
drop cascades to function voidtest2(integer,integer)
drop cascades to function voidtest3(integer)
drop cascades to function voidtest4(integer)
drop cascades to function voidtest5(integer)
DROP USER regress_unpriv_user;
RESET search_path;

10
src/test/regress/expected/create_index.out
View File

@ -3244,9 +3244,10 @@ INSERT INTO delete_test_table SELECT i, 1, 2, 3 FROM generate_series(1,1000) i;
-- REINDEX (VERBOSE)
--
CREATE TABLE reindex_verbose(id integer primary key);
\set VERBOSITY terse
\set VERBOSITY terse \\ -- suppress machine-dependent details
REINDEX (VERBOSE) TABLE reindex_verbose;
INFO: index "reindex_verbose_pkey" was reindexed
\set VERBOSITY default
DROP TABLE reindex_verbose;
--
-- REINDEX SCHEMA
@ -3315,6 +3316,11 @@ ERROR: must be owner of schema schema_to_reindex
-- Clean up
RESET ROLE;
DROP ROLE regress_reindexuser;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA schema_to_reindex CASCADE;
NOTICE: drop cascades to 6 other objects
DETAIL: drop cascades to table table1
drop cascades to table table2
drop cascades to materialized view matview
drop cascades to view view
drop cascades to table reindex_before
drop cascades to table reindex_after

90
src/test/regress/expected/create_view.out
View File

@ -1717,8 +1717,96 @@ select pg_get_ruledef(oid, true) from pg_rewrite
(1 row)
-- clean up all the random objects we made above
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA temp_view_test CASCADE;
NOTICE: drop cascades to 27 other objects
DETAIL: drop cascades to table temp_view_test.base_table
drop cascades to view v2_temp
drop cascades to view v4_temp
drop cascades to view v6_temp
drop cascades to view v7_temp
drop cascades to view v10_temp
drop cascades to view v8_temp
drop cascades to view v9_temp
drop cascades to view v11_temp
drop cascades to view v12_temp
drop cascades to table temp_view_test.base_table2
drop cascades to view v5_temp
drop cascades to view temp_view_test.v1
drop cascades to view temp_view_test.v2
drop cascades to view temp_view_test.v3
drop cascades to view temp_view_test.v4
drop cascades to view temp_view_test.v5
drop cascades to view temp_view_test.v6
drop cascades to view temp_view_test.v7
drop cascades to view temp_view_test.v8
drop cascades to sequence temp_view_test.seq1
drop cascades to view temp_view_test.v9
drop cascades to table temp_view_test.tx1
drop cascades to view aliased_view_1
drop cascades to view aliased_view_2
drop cascades to view aliased_view_3
drop cascades to view aliased_view_4
DROP SCHEMA testviewschm2 CASCADE;
NOTICE: drop cascades to 62 other objects
DETAIL: drop cascades to table t1
drop cascades to view temporal1
drop cascades to view temporal2
drop cascades to view temporal3
drop cascades to view temporal4
drop cascades to table t2
drop cascades to view nontemp1
drop cascades to view nontemp2
drop cascades to view nontemp3
drop cascades to view nontemp4
drop cascades to table tbl1
drop cascades to table tbl2
drop cascades to table tbl3
drop cascades to table tbl4
drop cascades to view mytempview
drop cascades to view pubview
drop cascades to view mysecview1
drop cascades to view mysecview2
drop cascades to view mysecview3
drop cascades to view mysecview4
drop cascades to view unspecified_types
drop cascades to table tt1
drop cascades to table tx1
drop cascades to table tt2
drop cascades to table tt3
drop cascades to table tt4
drop cascades to view v1
drop cascades to view v1a
drop cascades to view v2
drop cascades to view v2a
drop cascades to view v3
drop cascades to table tt5
drop cascades to table tt6
drop cascades to view vv1
drop cascades to table tt7
drop cascades to table tt8
drop cascades to view vv2
drop cascades to view vv3
drop cascades to view vv4
drop cascades to table tt7a
drop cascades to table tt8a
drop cascades to view vv2a
drop cascades to table tt9
drop cascades to table tt10
drop cascades to view vv5
drop cascades to table tt11
drop cascades to table tt12
drop cascades to table tt13
drop cascades to view vv6
drop cascades to table tt14t
drop cascades to function tt14f()
drop cascades to view tt14v
drop cascades to type nestedcomposite
drop cascades to view tt15v
drop cascades to view tt16v
drop cascades to view tt17v
drop cascades to view tt18v
drop cascades to view tt19v
drop cascades to view tt20v
drop cascades to view tt21v
drop cascades to view tt22v
drop cascades to view tt23v

10
src/test/regress/expected/dependency.out
View File

@ -133,9 +133,17 @@ privileges for table deptest1
owner of default privileges on new relations belonging to role regress_dep_user1 in schema deptest
DROP OWNED BY regress_dep_user1;
DROP USER regress_dep_user1;
\set VERBOSITY terse
DROP USER regress_dep_user2;
ERROR: role "regress_dep_user2" cannot be dropped because some objects depend on it
DETAIL: owner of schema deptest
owner of sequence deptest_a_seq
owner of table deptest
owner of function deptest_func()
owner of type deptest_enum
owner of type deptest_range
owner of table deptest2
owner of sequence ss1
owner of type deptest_t
DROP OWNED BY regress_dep_user2, regress_dep_user0;
DROP USER regress_dep_user2;
DROP USER regress_dep_user0;

6
src/test/regress/expected/event_trigger.out
View File

@ -185,11 +185,11 @@ alter event trigger regress_event_trigger rename to regress_event_trigger3;
drop event trigger regress_event_trigger;
ERROR: event trigger "regress_event_trigger" does not exist
-- should fail, regress_evt_user owns some objects
-- use terse mode to avoid ordering issues in DROP ROLE detail output
\set VERBOSITY terse
drop role regress_evt_user;
ERROR: role "regress_evt_user" cannot be dropped because some objects depend on it
\set VERBOSITY default
DETAIL: owner of event trigger regress_event_trigger3
owner of user mapping for regress_evt_user on server useless_server
owner of default privileges on new relations belonging to role regress_evt_user
-- cleanup before next test
-- these are all OK; the second one should emit a NOTICE
drop event trigger if exists regress_event_trigger2;

9
src/test/regress/expected/float4-misrounded-input.out
View File

@ -931,8 +931,11 @@ select float4send(flt) as ibits,
(261 rows)
-- clean up, lest opr_sanity complain
\set VERBOSITY terse
drop type xfloat4 cascade;
NOTICE: drop cascades to 6 other objects
\set VERBOSITY default
--
DETAIL: drop cascades to function xfloat4in(cstring)
drop cascades to function xfloat4out(xfloat4)
drop cascades to cast from xfloat4 to real
drop cascades to cast from real to xfloat4
drop cascades to cast from xfloat4 to integer
drop cascades to cast from integer to xfloat4

9
src/test/regress/expected/float4.out
View File

@ -931,8 +931,11 @@ select float4send(flt) as ibits,
(261 rows)
-- clean up, lest opr_sanity complain
\set VERBOSITY terse
drop type xfloat4 cascade;
NOTICE: drop cascades to 6 other objects
\set VERBOSITY default
--
DETAIL: drop cascades to function xfloat4in(cstring)
drop cascades to function xfloat4out(xfloat4)
drop cascades to cast from xfloat4 to real
drop cascades to cast from real to xfloat4
drop cascades to cast from xfloat4 to integer
drop cascades to cast from integer to xfloat4

9
src/test/regress/expected/float8.out
View File

@ -1197,8 +1197,11 @@ select float8send(flt) as ibits,
(209 rows)
-- clean up, lest opr_sanity complain
\set VERBOSITY terse
drop type xfloat8 cascade;
NOTICE: drop cascades to 6 other objects
\set VERBOSITY default
--
DETAIL: drop cascades to function xfloat8in(cstring)
drop cascades to function xfloat8out(xfloat8)
drop cascades to cast from xfloat8 to double precision
drop cascades to cast from double precision to xfloat8
drop cascades to cast from xfloat8 to bigint
drop cascades to cast from bigint to xfloat8

32
src/test/regress/expected/foreign_data.out
View File

@ -439,11 +439,10 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
SET ROLE regress_test_role;
ALTER SERVER s1 OWNER TO regress_test_indirect;
RESET ROLE;
-- We use terse mode to avoid ordering issues in DROP ROLE detail output
\set VERBOSITY terse
DROP ROLE regress_test_indirect; -- ERROR
ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it
\set VERBOSITY default
DETAIL: privileges for foreign-data wrapper foo
owner of server s1
\des+
List of foreign servers
Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
@ -1204,10 +1203,10 @@ ERROR: permission denied for foreign-data wrapper foo
ALTER SERVER s9 VERSION '1.1';
GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
CREATE USER MAPPING FOR current_user SERVER s9;
\set VERBOSITY terse
DROP SERVER s9 CASCADE;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to user mapping for public on server s9
drop cascades to user mapping for regress_unprivileged_role on server s9
RESET ROLE;
CREATE SERVER s9 FOREIGN DATA WRAPPER foo;
GRANT USAGE ON FOREIGN SERVER s9 TO regress_unprivileged_role;
@ -1275,10 +1274,10 @@ SET ROLE regress_unprivileged_role;
(9 rows)
RESET ROLE;
\set VERBOSITY terse
DROP SERVER s10 CASCADE;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to user mapping for public on server s10
drop cascades to user mapping for regress_unprivileged_role on server s10
-- Triggers
CREATE FUNCTION dummy_trigger() RETURNS TRIGGER AS $$
BEGIN
@ -1620,12 +1619,15 @@ Inherits: fd_pt1
Child tables: ct3,
ft3
\set VERBOSITY terse
DROP FOREIGN TABLE ft2; -- ERROR
ERROR: cannot drop foreign table ft2 because other objects depend on it
DETAIL: table ct3 depends on foreign table ft2
foreign table ft3 depends on foreign table ft2
HINT: Use DROP ... CASCADE to drop the dependent objects too.
DROP FOREIGN TABLE ft2 CASCADE;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to table ct3
drop cascades to foreign table ft3
CREATE FOREIGN TABLE ft2 (
c1 integer NOT NULL,
c2 text,
@ -1995,18 +1997,26 @@ ERROR: cannot attach a permanent relation as partition of temporary relation "t
DROP FOREIGN TABLE foreign_part;
DROP TABLE temp_parted;
-- Cleanup
\set VERBOSITY terse
DROP SCHEMA foreign_schema CASCADE;
DROP ROLE regress_test_role; -- ERROR
ERROR: role "regress_test_role" cannot be dropped because some objects depend on it
DETAIL: privileges for foreign-data wrapper foo
privileges for server s4
owner of user mapping for regress_test_role on server s6
DROP SERVER t1 CASCADE;
NOTICE: drop cascades to user mapping for public on server t1
DROP USER MAPPING FOR regress_test_role SERVER s6;
DROP FOREIGN DATA WRAPPER foo CASCADE;
NOTICE: drop cascades to 5 other objects
DETAIL: drop cascades to server s4
drop cascades to user mapping for regress_foreign_data_user on server s4
drop cascades to server s6
drop cascades to server s9
drop cascades to user mapping for regress_unprivileged_role on server s9
DROP SERVER s8 CASCADE;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to user mapping for regress_foreign_data_user on server s8
drop cascades to user mapping for public on server s8
DROP ROLE regress_test_indirect;
DROP ROLE regress_test_role;
DROP ROLE regress_unprivileged_role; -- ERROR

10
src/test/regress/expected/foreign_key.out
View File

@ -2015,7 +2015,13 @@ alter table fkpart2.fk_part detach partition fkpart2.fk_part_1;
alter table fkpart2.fk_part_1 drop constraint fkey; -- ok
alter table fkpart2.fk_part_1_1 drop constraint my_fkey; -- doesn't exist
ERROR: constraint "my_fkey" of relation "fk_part_1_1" does not exist
\set VERBOSITY terse \\ -- suppress cascade details
drop schema fkpart0, fkpart1, fkpart2 cascade;
NOTICE: drop cascades to 8 other objects
\set VERBOSITY default
DETAIL: drop cascades to table fkpart2.pkey
drop cascades to table fkpart2.fk_part
drop cascades to table fkpart2.fk_part_1
drop cascades to table fkpart1.pkey
drop cascades to table fkpart1.fk_part
drop cascades to table fkpart1.fk_part_1
drop cascades to table fkpart0.pkey
drop cascades to table fkpart0.fk_part

19
src/test/regress/expected/object_address.out
View File

@ -492,12 +492,29 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)).*,
---
--- Cleanup resources
---
\set VERBOSITY terse \\ -- suppress cascade details
DROP FOREIGN DATA WRAPPER addr_fdw CASCADE;
NOTICE: drop cascades to 4 other objects
DETAIL: drop cascades to server addr_fserv
drop cascades to foreign table genftable
drop cascades to server integer
drop cascades to user mapping for regress_addr_user on server integer
DROP PUBLICATION addr_pub;
DROP SUBSCRIPTION addr_sub;
DROP SCHEMA addr_nsp CASCADE;
NOTICE: drop cascades to 14 other objects
DETAIL: drop cascades to text search dictionary addr_ts_dict
drop cascades to text search configuration addr_ts_conf
drop cascades to text search template addr_ts_temp
drop cascades to text search parser addr_ts_prs
drop cascades to table gentable
drop cascades to table parttable
drop cascades to view genview
drop cascades to materialized view genmatview
drop cascades to type gencomptype
drop cascades to type genenum
drop cascades to function genaggr(integer)
drop cascades to type gendomain
drop cascades to function trig()
drop cascades to function proc(integer)
DROP OWNED BY regress_addr_user;
DROP USER regress_addr_user;

4
src/test/regress/expected/partition_prune.out
View File

@ -3510,10 +3510,10 @@ explain (costs off) update inh_lp1 set value = 10 where a = 2;
Filter: (a = 2)
(3 rows)
\set VERBOSITY terse \\ -- suppress cascade details
drop table inh_lp cascade;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to table inh_lp1
drop cascades to table inh_lp2
reset enable_partition_pruning;
reset constraint_exclusion;
-- Check pruning for a partition tree containing only temporary relations

9
src/test/regress/expected/privileges.out
View File

@ -1827,10 +1827,13 @@ SELECT has_function_privilege('regress_priv_user1', 'testns.priv_testproc(int)',
t
(1 row)
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA testns CASCADE;
NOTICE: drop cascades to 5 other objects
\set VERBOSITY default
DETAIL: drop cascades to table testns.t1
drop cascades to table testns.t2
drop cascades to function testns.priv_testfunc(integer)
drop cascades to function testns.priv_testagg(integer)
drop cascades to function testns.priv_testproc(integer)
-- Change owner of the schema & and rename of new schema owner
\c -
CREATE ROLE regress_schemauser1 superuser login;
@ -1852,9 +1855,7 @@ SELECT nspname, rolname FROM pg_namespace, pg_roles WHERE pg_namespace.nspname =
(1 row)
set session role regress_schemauser_renamed;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA testns CASCADE;
\set VERBOSITY default
-- clean up
\c -
DROP ROLE regress_schemauser1;

7
src/test/regress/expected/rolenames.out
View File

@ -435,7 +435,6 @@ LINE 1: ALTER USER NONE SET application_name to 'BOMB';
ALTER USER nonexistent SET application_name to 'BOMB'; -- error
ERROR: role "nonexistent" does not exist
-- CREATE SCHEMA
set client_min_messages to error;
CREATE SCHEMA newschema1 AUTHORIZATION CURRENT_USER;
CREATE SCHEMA newschema2 AUTHORIZATION "current_user";
CREATE SCHEMA newschema3 AUTHORIZATION SESSION_USER;
@ -472,10 +471,15 @@ SELECT n.nspname, r.rolname FROM pg_namespace n
(5 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;
NOTICE: schema "newschema3" already exists, skipping
CREATE SCHEMA IF NOT EXISTS newschema4 AUTHORIZATION regress_testrolx;
NOTICE: schema "newschema4" already exists, skipping
CREATE SCHEMA IF NOT EXISTS newschema5 AUTHORIZATION "Public";
NOTICE: schema "newschema5" already exists, skipping
CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION USER; -- error
ERROR: syntax error at or near "USER"
LINE 1: CREATE SCHEMA IF NOT EXISTS newschema6 AUTHORIZATION USER;
@ -509,7 +513,6 @@ SELECT n.nspname, r.rolname FROM pg_namespace n
-- ALTER TABLE OWNER TO
\c -
SET SESSION AUTHORIZATION regress_testrol0;
set client_min_messages to error;
CREATE TABLE testtab1 (a int);
CREATE TABLE testtab2 (a int);
CREATE TABLE testtab3 (a int);

39
src/test/regress/expected/rowsecurity.out
View File

@ -1393,10 +1393,10 @@ ERROR: infinite recursion detected in policy for relation "rec1"
-- Mutual recursion via .s.b views
--
SET SESSION AUTHORIZATION regress_rls_bob;
\set VERBOSITY terse \\ -- suppress cascade details
DROP VIEW rec1v, rec2v CASCADE;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to policy r1 on table rec1
drop cascades to policy r2 on table rec2
CREATE VIEW rec1v WITH (security_barrier) AS SELECT * FROM rec1;
CREATE VIEW rec2v WITH (security_barrier) AS SELECT * FROM rec2;
SET SESSION AUTHORIZATION regress_rls_alice;
@ -2775,10 +2775,10 @@ DROP TABLE test_qual_pushdown;
-- Plancache invalidate on user change.
--
RESET SESSION AUTHORIZATION;
\set VERBOSITY terse \\ -- suppress cascade details
DROP TABLE t1 CASCADE;
NOTICE: drop cascades to 2 other objects
\set VERBOSITY default
DETAIL: drop cascades to table t2
drop cascades to table t3
CREATE TABLE t1 (a integer);
GRANT SELECT ON t1 TO regress_rls_bob, regress_rls_carol;
CREATE POLICY p1 ON t1 TO regress_rls_bob USING ((a % 2) = 0);
@ -3916,10 +3916,37 @@ DROP USER regress_rls_dob_role2;
-- Clean up objects
--
RESET SESSION AUTHORIZATION;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA regress_rls_schema CASCADE;
NOTICE: drop cascades to 29 other objects
\set VERBOSITY default
DETAIL: drop cascades to function f_leak(text)
drop cascades to table uaccount
drop cascades to table category
drop cascades to table document
drop cascades to table part_document
drop cascades to table dependent
drop cascades to table rec1
drop cascades to table rec2
drop cascades to view rec1v
drop cascades to view rec2v
drop cascades to table s1
drop cascades to table s2
drop cascades to view v2
drop cascades to table b1
drop cascades to view bv1
drop cascades to table z1
drop cascades to table z2
drop cascades to table x1
drop cascades to table y1
drop cascades to table y2
drop cascades to table t1
drop cascades to table t2
drop cascades to table t3
drop cascades to table t4
drop cascades to table current_check
drop cascades to table dep1
drop cascades to table dep2
drop cascades to table dob_t1
drop cascades to table dob_t2
DROP USER regress_rls_alice;
DROP USER regress_rls_bob;
DROP USER regress_rls_carol;

6
src/test/regress/expected/rules.out
View File

@ -2638,10 +2638,12 @@ select * from id_ordered;
6 | Test 6
(6 rows)
\set VERBOSITY terse \\ -- suppress cascade details
drop table id cascade;
NOTICE: drop cascades to 4 other objects
\set VERBOSITY default
DETAIL: drop cascades to table test_1
drop cascades to table test_2
drop cascades to table test_3
drop cascades to view id_ordered
--
-- check corner case where an entirely-dummy subplan is created by
-- constraint exclusion

9
src/test/regress/expected/stats_ext.out
View File

@ -122,12 +122,17 @@ EXCEPTION WHEN wrong_object_type THEN
END;
$$;
NOTICE: stats on toast table not created
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA tststats CASCADE;
NOTICE: drop cascades to 7 other objects
DETAIL: drop cascades to table tststats.t
drop cascades to sequence tststats.s
drop cascades to view tststats.v
drop cascades to materialized view tststats.mv
drop cascades to type tststats.ty
drop cascades to foreign table tststats.f
drop cascades to table tststats.pt
DROP FOREIGN DATA WRAPPER extstats_dummy_fdw CASCADE;
NOTICE: drop cascades to server extstats_dummy_srv
\set VERBOSITY default
-- n-distinct tests
CREATE TABLE ndistinct (
filler1 TEXT,

7
src/test/regress/expected/truncate.out
View File

@ -513,9 +513,12 @@ select tp_ins_data();
(1 row)
-- should truncate everything
SET client_min_messages TO WARNING; -- suppress cascading notices
TRUNCATE TABLE truncprim CASCADE;
RESET client_min_messages;
NOTICE: truncate cascades to table "truncpart"
NOTICE: truncate cascades to table "truncpart_1"
NOTICE: truncate cascades to table "truncpart_2"
NOTICE: truncate cascades to table "truncpart_2_1"
NOTICE: truncate cascades to table "truncpart_2_d"
SELECT * FROM tp_chk_data();
pktb | pkval | fktb | fkval
------+-------+------+-------

2
src/test/regress/sql/alter_generic.sql
View File

@ -579,8 +579,6 @@ SELECT nspname, prsname
---
--- Cleanup resources
---
\set VERBOSITY terse \\ -- suppress cascade details
DROP FOREIGN DATA WRAPPER alt_fdw2 CASCADE;
DROP FOREIGN DATA WRAPPER alt_fdw3 CASCADE;

1
src/test/regress/sql/collate.sql
View File

@ -264,5 +264,4 @@ SELECT collation for ((SELECT b FROM collate_test1 LIMIT 1));
-- trying to run any platform-specific collation tests later, so we
-- must get rid of them.
--
\set VERBOSITY terse
DROP SCHEMA collate_tests CASCADE;

2
src/test/regress/sql/create_function_3.sql
View File

@ -220,8 +220,6 @@ $$ SELECT generate_series(1, a) $$ STABLE;
SELECT * FROM voidtest5(3);
-- Cleanup
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA temp_func_test CASCADE;
\set VERBOSITY default
DROP USER regress_unpriv_user;
RESET search_path;

4
src/test/regress/sql/create_index.sql
View File

@ -1167,8 +1167,9 @@ INSERT INTO delete_test_table SELECT i, 1, 2, 3 FROM generate_series(1,1000) i;
-- REINDEX (VERBOSE)
--
CREATE TABLE reindex_verbose(id integer primary key);
\set VERBOSITY terse
\set VERBOSITY terse \\ -- suppress machine-dependent details
REINDEX (VERBOSE) TABLE reindex_verbose;
\set VERBOSITY default
DROP TABLE reindex_verbose;
--
@ -1221,5 +1222,4 @@ REINDEX SCHEMA schema_to_reindex;
-- Clean up
RESET ROLE;
DROP ROLE regress_reindexuser;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA schema_to_reindex CASCADE;

1
src/test/regress/sql/create_view.sql
View File

@ -593,6 +593,5 @@ select pg_get_ruledef(oid, true) from pg_rewrite
where ev_class = 'tt23v'::regclass and ev_type = '1';
-- clean up all the random objects we made above
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA temp_view_test CASCADE;
DROP SCHEMA testviewschm2 CASCADE;

3
src/test/regress/sql/dependency.sql
View File

@ -38,8 +38,8 @@ DROP USER regress_dep_user2;
\set VERBOSITY terse
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 regress_dep_user3;
@ -110,7 +110,6 @@ DROP USER regress_dep_user1;
DROP OWNED BY regress_dep_user1;
DROP USER regress_dep_user1;
\set VERBOSITY terse
DROP USER regress_dep_user2;
DROP OWNED BY regress_dep_user2, regress_dep_user0;
DROP USER regress_dep_user2;

3
src/test/regress/sql/event_trigger.sql
View File

@ -157,10 +157,7 @@ alter event trigger regress_event_trigger rename to regress_event_trigger3;
drop event trigger regress_event_trigger;
-- should fail, regress_evt_user owns some objects
-- use terse mode to avoid ordering issues in DROP ROLE detail output
\set VERBOSITY terse
drop role regress_evt_user;
\set VERBOSITY default
-- cleanup before next test
-- these are all OK; the second one should emit a NOTICE

5
src/test/regress/sql/float4.sql
View File

@ -344,9 +344,4 @@ select float4send(flt) as ibits,
offset 0) s;
-- clean up, lest opr_sanity complain
\set VERBOSITY terse
drop type xfloat4 cascade;
\set VERBOSITY default
--

5
src/test/regress/sql/float8.sql
View File

@ -463,9 +463,4 @@ select float8send(flt) as ibits,
offset 0) s;
-- clean up, lest opr_sanity complain
\set VERBOSITY terse
drop type xfloat8 cascade;
\set VERBOSITY default
--

11
src/test/regress/sql/foreign_data.sql
View File

@ -199,10 +199,7 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
SET ROLE regress_test_role;
ALTER SERVER s1 OWNER TO regress_test_indirect;
RESET ROLE;
-- We use terse mode to avoid ordering issues in DROP ROLE detail output
\set VERBOSITY terse
DROP ROLE regress_test_indirect; -- ERROR
\set VERBOSITY default
\des+
ALTER SERVER s8 RENAME to s8new;
@ -504,9 +501,7 @@ CREATE SERVER s10 FOREIGN DATA WRAPPER foo; -- ERROR
ALTER SERVER s9 VERSION '1.1';
GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
CREATE USER MAPPING FOR current_user SERVER s9;
\set VERBOSITY terse
DROP SERVER s9 CASCADE;
\set VERBOSITY default
RESET ROLE;
CREATE SERVER s9 FOREIGN DATA WRAPPER foo;
GRANT USAGE ON FOREIGN SERVER s9 TO regress_unprivileged_role;
@ -530,9 +525,7 @@ RESET ROLE;
SET ROLE regress_unprivileged_role;
\deu+
RESET ROLE;
\set VERBOSITY terse
DROP SERVER s10 CASCADE;
\set VERBOSITY default
-- Triggers
CREATE FUNCTION dummy_trigger() RETURNS TRIGGER AS $$
@ -662,10 +655,8 @@ SELECT relname, conname, contype, conislocal, coninhcount, connoinherit
-- child does not inherit NO INHERIT constraints
\d+ fd_pt1
\d+ ft2
\set VERBOSITY terse
DROP FOREIGN TABLE ft2; -- ERROR
DROP FOREIGN TABLE ft2 CASCADE;
\set VERBOSITY default
CREATE FOREIGN TABLE ft2 (
c1 integer NOT NULL,
c2 text,
@ -807,14 +798,12 @@ DROP FOREIGN TABLE foreign_part;
DROP TABLE temp_parted;
-- Cleanup
\set VERBOSITY terse
DROP SCHEMA foreign_schema CASCADE;
DROP ROLE regress_test_role; -- ERROR
DROP SERVER t1 CASCADE;
DROP USER MAPPING FOR regress_test_role SERVER s6;
DROP FOREIGN DATA WRAPPER foo CASCADE;
DROP SERVER s8 CASCADE;
\set VERBOSITY default
DROP ROLE regress_test_indirect;
DROP ROLE regress_test_role;
DROP ROLE regress_unprivileged_role; -- ERROR

2
src/test/regress/sql/foreign_key.sql
View File

@ -1440,6 +1440,4 @@ alter table fkpart2.fk_part detach partition fkpart2.fk_part_1;
alter table fkpart2.fk_part_1 drop constraint fkey; -- ok
alter table fkpart2.fk_part_1_1 drop constraint my_fkey; -- doesn't exist
\set VERBOSITY terse \\ -- suppress cascade details
drop schema fkpart0, fkpart1, fkpart2 cascade;
\set VERBOSITY default

2
src/test/regress/sql/object_address.sql
View File

@ -210,8 +210,6 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)).*,
---
--- Cleanup resources
---
\set VERBOSITY terse \\ -- suppress cascade details
DROP FOREIGN DATA WRAPPER addr_fdw CASCADE;
DROP PUBLICATION addr_pub;
DROP SUBSCRIPTION addr_sub;

2
src/test/regress/sql/partition_prune.sql
View File

@ -906,9 +906,7 @@ explain (costs off) delete from inh_lp where a = 1;
-- inheritance children
explain (costs off) update inh_lp1 set value = 10 where a = 2;
\set VERBOSITY terse \\ -- suppress cascade details
drop table inh_lp cascade;
\set VERBOSITY default
reset enable_partition_pruning;
reset constraint_exclusion;

4
src/test/regress/sql/privileges.sql
View File

@ -1074,9 +1074,7 @@ SELECT has_function_privilege('regress_priv_user1', 'testns.priv_testfunc(int)',
SELECT has_function_privilege('regress_priv_user1', 'testns.priv_testagg(int)', 'EXECUTE'); -- true
SELECT has_function_privilege('regress_priv_user1', 'testns.priv_testproc(int)', 'EXECUTE'); -- true
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA testns CASCADE;
\set VERBOSITY default
-- Change owner of the schema & and rename of new schema owner
@ -1095,9 +1093,7 @@ ALTER ROLE regress_schemauser2 RENAME TO regress_schemauser_renamed;
SELECT nspname, rolname FROM pg_namespace, pg_roles WHERE pg_namespace.nspname = 'testns' AND pg_namespace.nspowner = pg_roles.oid;
set session role regress_schemauser_renamed;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA testns CASCADE;
\set VERBOSITY default
-- clean up
\c -

2
src/test/regress/sql/rolenames.sql
View File

@ -177,7 +177,6 @@ ALTER USER NONE SET application_name to 'BOMB'; -- error
ALTER USER nonexistent SET application_name to 'BOMB'; -- error
-- CREATE SCHEMA
set client_min_messages to error;
CREATE SCHEMA newschema1 AUTHORIZATION CURRENT_USER;
CREATE SCHEMA newschema2 AUTHORIZATION "current_user";
CREATE SCHEMA newschema3 AUTHORIZATION SESSION_USER;
@ -215,7 +214,6 @@ SELECT n.nspname, r.rolname FROM pg_namespace n
-- ALTER TABLE OWNER TO
\c -
SET SESSION AUTHORIZATION regress_testrol0;
set client_min_messages to error;
CREATE TABLE testtab1 (a int);
CREATE TABLE testtab2 (a int);
CREATE TABLE testtab3 (a int);

6
src/test/regress/sql/rowsecurity.sql
View File

@ -518,9 +518,7 @@ SELECT * FROM rec1; -- fail, mutual recursion via views
--
SET SESSION AUTHORIZATION regress_rls_bob;
\set VERBOSITY terse \\ -- suppress cascade details
DROP VIEW rec1v, rec2v CASCADE;
\set VERBOSITY default
CREATE VIEW rec1v WITH (security_barrier) AS SELECT * FROM rec1;
CREATE VIEW rec2v WITH (security_barrier) AS SELECT * FROM rec2;
@ -1026,9 +1024,7 @@ DROP TABLE test_qual_pushdown;
--
RESET SESSION AUTHORIZATION;
\set VERBOSITY terse \\ -- suppress cascade details
DROP TABLE t1 CASCADE;
\set VERBOSITY default
CREATE TABLE t1 (a integer);
@ -1773,9 +1769,7 @@ DROP USER regress_rls_dob_role2;
--
RESET SESSION AUTHORIZATION;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA regress_rls_schema CASCADE;
\set VERBOSITY default
DROP USER regress_rls_alice;
DROP USER regress_rls_bob;

2
src/test/regress/sql/rules.sql
View File

@ -936,9 +936,7 @@ update id_ordered set name = 'update 4' where id = 4;
update id_ordered set name = 'update 5' where id = 5;
select * from id_ordered;
\set VERBOSITY terse \\ -- suppress cascade details
drop table id cascade;
\set VERBOSITY default
--
-- check corner case where an entirely-dummy subplan is created by

2
src/test/regress/sql/stats_ext.sql
View File

@ -89,10 +89,8 @@ EXCEPTION WHEN wrong_object_type THEN
END;
$$;
\set VERBOSITY terse \\ -- suppress cascade details
DROP SCHEMA tststats CASCADE;
DROP FOREIGN DATA WRAPPER extstats_dummy_fdw CASCADE;
\set VERBOSITY default
-- n-distinct tests
CREATE TABLE ndistinct (

2
src/test/regress/sql/truncate.sql
View File

@ -280,9 +280,7 @@ select * from tp_chk_data();
select tp_ins_data();
-- should truncate everything
SET client_min_messages TO WARNING; -- suppress cascading notices
TRUNCATE TABLE truncprim CASCADE;
RESET client_min_messages;
SELECT * FROM tp_chk_data();
SELECT tp_ins_data();