Skip to content

Commit c219cbf

Browse files
sfrostsfrost
committed
Move rowsecurity event trigger test
The event trigger test for rowsecurity can cause problems for other tests which are run in parallel with it. Instead of running that test in the rowsecurity set, move it to the event_trigger set, which runs isolated from other tests. Also reverts 7161b08, which moved rowsecurity into its own test group. That's no longer necessary, now that the event trigger test is gone from the rowsecurity set of tests. Pointed out by Tom.
1 parent f454144 commit c219cbf

File tree

6 files changed

+89
-96
lines changed

6 files changed

+89
-96
lines changed

‎src/test/regress/expected/event_trigger.out

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,3 +373,46 @@ alter table rewriteme alter column foo type numeric(12,4);
373373
drop table rewriteme;
374374
drop event trigger no_rewrite_allowed;
375375
drop function test_evtrig_no_rewrite();
376+
-- test Row Security Event Trigger
377+
RESET SESSION AUTHORIZATION;
378+
CREATE TABLE event_trigger_test (a integer, b text);
379+
CREATE OR REPLACE FUNCTION start_command()
380+
RETURNS event_trigger AS $$
381+
BEGIN
382+
RAISE NOTICE '% - ddl_command_start', tg_tag;
383+
END;
384+
$$ LANGUAGE plpgsql;
385+
CREATE OR REPLACE FUNCTION end_command()
386+
RETURNS event_trigger AS $$
387+
BEGIN
388+
RAISE NOTICE '% - ddl_command_end', tg_tag;
389+
END;
390+
$$ LANGUAGE plpgsql;
391+
CREATE OR REPLACE FUNCTION drop_sql_command()
392+
RETURNS event_trigger AS $$
393+
BEGIN
394+
RAISE NOTICE '% - sql_drop', tg_tag;
395+
END;
396+
$$ LANGUAGE plpgsql;
397+
CREATE EVENT TRIGGER start_rls_command ON ddl_command_start
398+
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE start_command();
399+
CREATE EVENT TRIGGER end_rls_command ON ddl_command_end
400+
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE end_command();
401+
CREATE EVENT TRIGGER sql_drop_command ON sql_drop
402+
WHEN TAG IN ('DROP POLICY') EXECUTE PROCEDURE drop_sql_command();
403+
CREATE POLICY p1 ON event_trigger_test USING (FALSE);
404+
NOTICE: CREATE POLICY - ddl_command_start
405+
NOTICE: CREATE POLICY - ddl_command_end
406+
ALTER POLICY p1 ON event_trigger_test USING (TRUE);
407+
NOTICE: ALTER POLICY - ddl_command_start
408+
NOTICE: ALTER POLICY - ddl_command_end
409+
ALTER POLICY p1 ON event_trigger_test RENAME TO p2;
410+
NOTICE: ALTER POLICY - ddl_command_start
411+
NOTICE: ALTER POLICY - ddl_command_end
412+
DROP POLICY p2 ON event_trigger_test;
413+
NOTICE: DROP POLICY - ddl_command_start
414+
NOTICE: DROP POLICY - sql_drop
415+
NOTICE: DROP POLICY - ddl_command_end
416+
DROP EVENT TRIGGER start_rls_command;
417+
DROP EVENT TRIGGER end_rls_command;
418+
DROP EVENT TRIGGER sql_drop_command;

‎src/test/regress/expected/rowsecurity.out

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,51 +1998,6 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1;
19981998
One-Time Filter: false
19991999
(2 rows)
20002000

2001-
--
2002-
-- Event Triggers
2003-
--
2004-
RESET SESSION AUTHORIZATION;
2005-
CREATE TABLE event_trigger_test (a integer, b text);
2006-
CREATE OR REPLACE FUNCTION start_command()
2007-
RETURNS event_trigger AS $$
2008-
BEGIN
2009-
RAISE NOTICE '% - ddl_command_start', tg_tag;
2010-
END;
2011-
$$ LANGUAGE plpgsql;
2012-
CREATE OR REPLACE FUNCTION end_command()
2013-
RETURNS event_trigger AS $$
2014-
BEGIN
2015-
RAISE NOTICE '% - ddl_command_end', tg_tag;
2016-
END;
2017-
$$ LANGUAGE plpgsql;
2018-
CREATE OR REPLACE FUNCTION drop_sql_command()
2019-
RETURNS event_trigger AS $$
2020-
BEGIN
2021-
RAISE NOTICE '% - sql_drop', tg_tag;
2022-
END;
2023-
$$ LANGUAGE plpgsql;
2024-
CREATE EVENT TRIGGER start_rls_command ON ddl_command_start
2025-
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE start_command();
2026-
CREATE EVENT TRIGGER end_rls_command ON ddl_command_end
2027-
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE end_command();
2028-
CREATE EVENT TRIGGER sql_drop_command ON sql_drop
2029-
WHEN TAG IN ('DROP POLICY') EXECUTE PROCEDURE drop_sql_command();
2030-
CREATE POLICY p1 ON event_trigger_test USING (FALSE);
2031-
NOTICE: CREATE POLICY - ddl_command_start
2032-
NOTICE: CREATE POLICY - ddl_command_end
2033-
ALTER POLICY p1 ON event_trigger_test USING (TRUE);
2034-
NOTICE: ALTER POLICY - ddl_command_start
2035-
NOTICE: ALTER POLICY - ddl_command_end
2036-
ALTER POLICY p1 ON event_trigger_test RENAME TO p2;
2037-
NOTICE: ALTER POLICY - ddl_command_start
2038-
NOTICE: ALTER POLICY - ddl_command_end
2039-
DROP POLICY p2 ON event_trigger_test;
2040-
NOTICE: DROP POLICY - ddl_command_start
2041-
NOTICE: DROP POLICY - sql_drop
2042-
NOTICE: DROP POLICY - ddl_command_end
2043-
DROP EVENT TRIGGER start_rls_command;
2044-
DROP EVENT TRIGGER end_rls_command;
2045-
DROP EVENT TRIGGER sql_drop_command;
20462001
--
20472002
-- COPY TO/FROM
20482003
--

‎src/test/regress/parallel_schedule

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,12 @@ ignore: random
7878
# ----------
7979
# Another group of parallel tests
8080
# ----------
81-
test: select_into select_distinct select_distinct_on select_implicit select_having subselect union case join aggregates transactions random portals arrays btree_index hash_index update delete namespace prepared_xacts
81+
test: select_into select_distinct select_distinct_on select_implicit select_having subselect union case join aggregates transactions random portals arrays btree_index hash_index update namespace prepared_xacts delete
8282

8383
# ----------
8484
# Another group of parallel tests
8585
# ----------
86-
test: brin gin gist spgist privileges security_label collate matview lock replica_identity object_address
87-
88-
# rowsecurity creates an event trigger, so don't run it in parallel
89-
test: rowsecurity
86+
test: brin gin gist spgist privileges security_label collate matview lock replica_identity rowsecurity object_address
9087

9188
# ----------
9289
# Another group of parallel tests

‎src/test/regress/serial_schedule

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ test: collate
105105
test: matview
106106
test: lock
107107
test: replica_identity
108-
test: object_address
109108
test: rowsecurity
109+
test: object_address
110110
test: alter_generic
111111
test: misc
112112
test: psql

‎src/test/regress/sql/event_trigger.sql

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,46 @@ alter table rewriteme alter column foo type numeric(12,4);
279279
drop table rewriteme;
280280
drop event trigger no_rewrite_allowed;
281281
drop function test_evtrig_no_rewrite();
282+
283+
-- test Row Security Event Trigger
284+
RESET SESSION AUTHORIZATION;
285+
CREATE TABLE event_trigger_test (a integer, b text);
286+
287+
CREATE OR REPLACE FUNCTION start_command()
288+
RETURNS event_trigger AS $$
289+
BEGIN
290+
RAISE NOTICE '% - ddl_command_start', tg_tag;
291+
END;
292+
$$ LANGUAGE plpgsql;
293+
294+
CREATE OR REPLACE FUNCTION end_command()
295+
RETURNS event_trigger AS $$
296+
BEGIN
297+
RAISE NOTICE '% - ddl_command_end', tg_tag;
298+
END;
299+
$$ LANGUAGE plpgsql;
300+
301+
CREATE OR REPLACE FUNCTION drop_sql_command()
302+
RETURNS event_trigger AS $$
303+
BEGIN
304+
RAISE NOTICE '% - sql_drop', tg_tag;
305+
END;
306+
$$ LANGUAGE plpgsql;
307+
308+
CREATE EVENT TRIGGER start_rls_command ON ddl_command_start
309+
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE start_command();
310+
311+
CREATE EVENT TRIGGER end_rls_command ON ddl_command_end
312+
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE end_command();
313+
314+
CREATE EVENT TRIGGER sql_drop_command ON sql_drop
315+
WHEN TAG IN ('DROP POLICY') EXECUTE PROCEDURE drop_sql_command();
316+
317+
CREATE POLICY p1 ON event_trigger_test USING (FALSE);
318+
ALTER POLICY p1 ON event_trigger_test USING (TRUE);
319+
ALTER POLICY p1 ON event_trigger_test RENAME TO p2;
320+
DROP POLICY p2 ON event_trigger_test;
321+
322+
DROP EVENT TRIGGER start_rls_command;
323+
DROP EVENT TRIGGER end_rls_command;
324+
DROP EVENT TRIGGER sql_drop_command;

‎src/test/regress/sql/rowsecurity.sql

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -769,51 +769,6 @@ SET SESSION AUTHORIZATION rls_regress_user1;
769769
SELECT * FROM t1;
770770
EXPLAIN (COSTS OFF) SELECT * FROM t1;
771771

772-
--
773-
-- Event Triggers
774-
--
775-
RESET SESSION AUTHORIZATION;
776-
CREATE TABLE event_trigger_test (a integer, b text);
777-
778-
CREATE OR REPLACE FUNCTION start_command()
779-
RETURNS event_trigger AS $$
780-
BEGIN
781-
RAISE NOTICE '% - ddl_command_start', tg_tag;
782-
END;
783-
$$ LANGUAGE plpgsql;
784-
785-
CREATE OR REPLACE FUNCTION end_command()
786-
RETURNS event_trigger AS $$
787-
BEGIN
788-
RAISE NOTICE '% - ddl_command_end', tg_tag;
789-
END;
790-
$$ LANGUAGE plpgsql;
791-
792-
CREATE OR REPLACE FUNCTION drop_sql_command()
793-
RETURNS event_trigger AS $$
794-
BEGIN
795-
RAISE NOTICE '% - sql_drop', tg_tag;
796-
END;
797-
$$ LANGUAGE plpgsql;
798-
799-
CREATE EVENT TRIGGER start_rls_command ON ddl_command_start
800-
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE start_command();
801-
802-
CREATE EVENT TRIGGER end_rls_command ON ddl_command_end
803-
WHEN TAG IN ('CREATE POLICY', 'ALTER POLICY', 'DROP POLICY') EXECUTE PROCEDURE end_command();
804-
805-
CREATE EVENT TRIGGER sql_drop_command ON sql_drop
806-
WHEN TAG IN ('DROP POLICY') EXECUTE PROCEDURE drop_sql_command();
807-
808-
CREATE POLICY p1 ON event_trigger_test USING (FALSE);
809-
ALTER POLICY p1 ON event_trigger_test USING (TRUE);
810-
ALTER POLICY p1 ON event_trigger_test RENAME TO p2;
811-
DROP POLICY p2 ON event_trigger_test;
812-
813-
DROP EVENT TRIGGER start_rls_command;
814-
DROP EVENT TRIGGER end_rls_command;
815-
DROP EVENT TRIGGER sql_drop_command;
816-
817772
--
818773
-- COPY TO/FROM
819774
--

0 commit comments

Comments
 (0)