Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf7aab36

Browse files
committed
Fix pg_identify_object_as_address() with event triggers
Attempting to use this function with event triggers failed, as, sinceits introduction ina676201, this code has never associated an objectname with event triggers. This addresses the failure by adding theevent trigger name to the set defining its object address.Note that regression tests are added within event_trigger and notobject_address to avoid issues with concurrent connections in parallelschedules.Author: Joel JacobsonDiscussion:https://postgr.es/m/3c905e77-a026-46ae-8835-c3f6cd1d24c8@www.fastmail.comBackpatch-through: 9.6
1 parentfa26eba commitf7aab36

File tree

3 files changed

+33
-6
lines changed

3 files changed

+33
-6
lines changed

‎src/backend/catalog/objectaddress.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5607,10 +5607,7 @@ getObjectIdentityParts(const ObjectAddress *object,
56075607
{
56085608
HeapTupletup;
56095609
Form_pg_event_triggertrigForm;
5610-
5611-
/* no objname support here */
5612-
if (objname)
5613-
*objname=NIL;
5610+
char*evtname;
56145611

56155612
tup=SearchSysCache1(EVENTTRIGGEROID,
56165613
ObjectIdGetDatum(object->objectId));
@@ -5622,8 +5619,10 @@ getObjectIdentityParts(const ObjectAddress *object,
56225619
break;
56235620
}
56245621
trigForm= (Form_pg_event_trigger)GETSTRUCT(tup);
5625-
appendStringInfoString(&buffer,
5626-
quote_identifier(NameStr(trigForm->evtname)));
5622+
evtname=NameStr(trigForm->evtname);
5623+
appendStringInfoString(&buffer,quote_identifier(evtname));
5624+
if (objname)
5625+
*objname=list_make1(evtname);
56275626
ReleaseSysCache(tup);
56285627
break;
56295628
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,23 @@ DROP POLICY p2 ON event_trigger_test;
533533
NOTICE: DROP POLICY - ddl_command_start
534534
NOTICE: DROP POLICY - sql_drop
535535
NOTICE: DROP POLICY - ddl_command_end
536+
-- Check the object addresses of all the event triggers.
537+
SELECT
538+
e.evtname,
539+
pg_describe_object('pg_event_trigger'::regclass, e.oid, 0) as descr,
540+
b.type, b.object_names, b.object_args,
541+
pg_identify_object(a.classid, a.objid, a.objsubid) as ident
542+
FROM pg_event_trigger as e,
543+
LATERAL pg_identify_object_as_address('pg_event_trigger'::regclass, e.oid, 0) as b,
544+
LATERAL pg_get_object_address(b.type, b.object_names, b.object_args) as a
545+
ORDER BY e.evtname;
546+
evtname | descr | type | object_names | object_args | ident
547+
-------------------+---------------------------------+---------------+---------------------+-------------+--------------------------------------------------------
548+
end_rls_command | event trigger end_rls_command | event trigger | {end_rls_command} | {} | ("event trigger",,end_rls_command,end_rls_command)
549+
sql_drop_command | event trigger sql_drop_command | event trigger | {sql_drop_command} | {} | ("event trigger",,sql_drop_command,sql_drop_command)
550+
start_rls_command | event trigger start_rls_command | event trigger | {start_rls_command} | {} | ("event trigger",,start_rls_command,start_rls_command)
551+
(3 rows)
552+
536553
DROP EVENT TRIGGER start_rls_command;
537554
DROP EVENT TRIGGER end_rls_command;
538555
DROP EVENT TRIGGER sql_drop_command;

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,17 @@ ALTER POLICY p1 ON event_trigger_test USING (TRUE);
426426
ALTER POLICY p1ON event_trigger_test RENAME TO p2;
427427
DROP POLICY p2ON event_trigger_test;
428428

429+
-- Check the object addresses of all the event triggers.
430+
SELECT
431+
e.evtname,
432+
pg_describe_object('pg_event_trigger'::regclass,e.oid,0)as descr,
433+
b.type,b.object_names,b.object_args,
434+
pg_identify_object(a.classid,a.objid,a.objsubid)as ident
435+
FROM pg_event_triggeras e,
436+
LATERAL pg_identify_object_as_address('pg_event_trigger'::regclass,e.oid,0)as b,
437+
LATERAL pg_get_object_address(b.type,b.object_names,b.object_args)as a
438+
ORDER BYe.evtname;
439+
429440
DROP EVENT TRIGGER start_rls_command;
430441
DROP EVENT TRIGGER end_rls_command;
431442
DROP EVENT TRIGGER sql_drop_command;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp