Skip to content

Commit 6fef8bd

Browse files
committed
Rename event triggers to something more expressive
Instead of giving them numbers we call them pg_tde_ddl_start and pg_tde_ddl_end. Since the triggers are not on the same event the names do not matter for the order they are executed in.
1 parent 5a1fe76 commit 6fef8bd

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

contrib/pg_tde/pg_tde--1.0-rc.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,15 +515,15 @@ RETURNS event_trigger
515515
LANGUAGE C
516516
AS 'MODULE_PATHNAME';
517517

518-
CREATE EVENT TRIGGER pg_tde_trigger_create_index
518+
CREATE EVENT TRIGGER pg_tde_ddl_start
519519
ON ddl_command_start
520520
EXECUTE FUNCTION pg_tde_ddl_command_start_capture();
521-
ALTER EVENT TRIGGER pg_tde_trigger_create_index ENABLE ALWAYS;
521+
ALTER EVENT TRIGGER pg_tde_ddl_start ENABLE ALWAYS;
522522

523-
CREATE EVENT TRIGGER pg_tde_trigger_create_index_2
523+
CREATE EVENT TRIGGER pg_tde_ddl_end
524524
ON ddl_command_end
525525
EXECUTE FUNCTION pg_tde_ddl_command_end_capture();
526-
ALTER EVENT TRIGGER pg_tde_trigger_create_index_2 ENABLE ALWAYS;
526+
ALTER EVENT TRIGGER pg_tde_ddl_end ENABLE ALWAYS;
527527

528528
-- Per database extension initialization
529529
SELECT pg_tde_extension_initialize();

src/test/regress/expected/event_trigger_1.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -708,13 +708,13 @@ SELECT
708708
LATERAL pg_identify_object_as_address('pg_event_trigger'::regclass, e.oid, 0) as b,
709709
LATERAL pg_get_object_address(b.type, b.object_names, b.object_args) as a
710710
ORDER BY e.evtname;
711-
evtname | descr | type | object_names | object_args | ident
712-
-------------------------------+---------------------------------------------+---------------+---------------------------------+-------------+--------------------------------------------------------------------------------
713-
end_rls_command | event trigger end_rls_command | event trigger | {end_rls_command} | {} | ("event trigger",,end_rls_command,end_rls_command)
714-
pg_tde_trigger_create_index | event trigger pg_tde_trigger_create_index | event trigger | {pg_tde_trigger_create_index} | {} | ("event trigger",,pg_tde_trigger_create_index,pg_tde_trigger_create_index)
715-
pg_tde_trigger_create_index_2 | event trigger pg_tde_trigger_create_index_2 | event trigger | {pg_tde_trigger_create_index_2} | {} | ("event trigger",,pg_tde_trigger_create_index_2,pg_tde_trigger_create_index_2)
716-
sql_drop_command | event trigger sql_drop_command | event trigger | {sql_drop_command} | {} | ("event trigger",,sql_drop_command,sql_drop_command)
717-
start_rls_command | event trigger start_rls_command | event trigger | {start_rls_command} | {} | ("event trigger",,start_rls_command,start_rls_command)
711+
evtname | descr | type | object_names | object_args | ident
712+
-------------------+---------------------------------+---------------+---------------------+-------------+--------------------------------------------------------
713+
end_rls_command | event trigger end_rls_command | event trigger | {end_rls_command} | {} | ("event trigger",,end_rls_command,end_rls_command)
714+
pg_tde_ddl_end | event trigger pg_tde_ddl_end | event trigger | {pg_tde_ddl_end} | {} | ("event trigger",,pg_tde_ddl_end,pg_tde_ddl_end)
715+
pg_tde_ddl_start | event trigger pg_tde_ddl_start | event trigger | {pg_tde_ddl_start} | {} | ("event trigger",,pg_tde_ddl_start,pg_tde_ddl_start)
716+
sql_drop_command | event trigger sql_drop_command | event trigger | {sql_drop_command} | {} | ("event trigger",,sql_drop_command,sql_drop_command)
717+
start_rls_command | event trigger start_rls_command | event trigger | {start_rls_command} | {} | ("event trigger",,start_rls_command,start_rls_command)
718718
(5 rows)
719719

720720
DROP EVENT TRIGGER start_rls_command;

0 commit comments

Comments
 (0)