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

Commit6a76edb

Browse files
committed
Fix confusion between ObjectType and ObjectClass
Per report by Will Leinweber and Peter Eisentraut
1 parent82b55c9 commit6a76edb

File tree

3 files changed

+92
-3
lines changed

3 files changed

+92
-3
lines changed

‎src/backend/catalog/dependency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ deleteObjectsInList(ObjectAddresses *targetObjects, Relation *depRel,
210210
ObjectAddress*thisobj=targetObjects->refs+i;
211211

212212
if ((!(flags&PERFORM_DELETION_INTERNAL))&&
213-
EventTriggerSupportsObjectType(getObjectClass(thisobj)))
213+
EventTriggerSupportsObjectClass(getObjectClass(thisobj)))
214214
{
215215
EventTriggerSQLDropAddObject(thisobj);
216216
}

‎src/backend/commands/event_trigger.c

Lines changed: 89 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -905,9 +905,96 @@ EventTriggerSupportsObjectType(ObjectType obtype)
905905
caseOBJECT_EVENT_TRIGGER:
906906
/* no support for event triggers on event triggers */
907907
return false;
908-
default:
908+
caseOBJECT_AGGREGATE:
909+
caseOBJECT_ATTRIBUTE:
910+
caseOBJECT_CAST:
911+
caseOBJECT_COLUMN:
912+
caseOBJECT_CONSTRAINT:
913+
caseOBJECT_COLLATION:
914+
caseOBJECT_CONVERSION:
915+
caseOBJECT_DOMAIN:
916+
caseOBJECT_EXTENSION:
917+
caseOBJECT_FDW:
918+
caseOBJECT_FOREIGN_SERVER:
919+
caseOBJECT_FOREIGN_TABLE:
920+
caseOBJECT_FUNCTION:
921+
caseOBJECT_INDEX:
922+
caseOBJECT_LANGUAGE:
923+
caseOBJECT_LARGEOBJECT:
924+
caseOBJECT_MATVIEW:
925+
caseOBJECT_OPCLASS:
926+
caseOBJECT_OPERATOR:
927+
caseOBJECT_OPFAMILY:
928+
caseOBJECT_RULE:
929+
caseOBJECT_SCHEMA:
930+
caseOBJECT_SEQUENCE:
931+
caseOBJECT_TABLE:
932+
caseOBJECT_TRIGGER:
933+
caseOBJECT_TSCONFIGURATION:
934+
caseOBJECT_TSDICTIONARY:
935+
caseOBJECT_TSPARSER:
936+
caseOBJECT_TSTEMPLATE:
937+
caseOBJECT_TYPE:
938+
caseOBJECT_VIEW:
939+
return true;
940+
}
941+
return true;
942+
}
943+
944+
/*
945+
* Do event triggers support this object class?
946+
*/
947+
bool
948+
EventTriggerSupportsObjectClass(ObjectClassobjclass)
949+
{
950+
switch (objclass)
951+
{
952+
caseOCLASS_DATABASE:
953+
caseOCLASS_TBLSPACE:
954+
caseOCLASS_ROLE:
955+
/* no support for global objects */
956+
return false;
957+
caseOCLASS_EVENT_TRIGGER:
958+
/* no support for event triggers on event triggers */
959+
return false;
960+
caseOCLASS_CLASS:
961+
caseOCLASS_PROC:
962+
caseOCLASS_TYPE:
963+
caseOCLASS_CAST:
964+
caseOCLASS_COLLATION:
965+
caseOCLASS_CONSTRAINT:
966+
caseOCLASS_CONVERSION:
967+
caseOCLASS_DEFAULT:
968+
caseOCLASS_LANGUAGE:
969+
caseOCLASS_LARGEOBJECT:
970+
caseOCLASS_OPERATOR:
971+
caseOCLASS_OPCLASS:
972+
caseOCLASS_OPFAMILY:
973+
caseOCLASS_AMOP:
974+
caseOCLASS_AMPROC:
975+
caseOCLASS_REWRITE:
976+
caseOCLASS_TRIGGER:
977+
caseOCLASS_SCHEMA:
978+
caseOCLASS_TSPARSER:
979+
caseOCLASS_TSDICT:
980+
caseOCLASS_TSTEMPLATE:
981+
caseOCLASS_TSCONFIG:
982+
caseOCLASS_FDW:
983+
caseOCLASS_FOREIGN_SERVER:
984+
caseOCLASS_USER_MAPPING:
985+
caseOCLASS_DEFACL:
986+
caseOCLASS_EXTENSION:
987+
return true;
988+
989+
caseMAX_OCLASS:
990+
/*
991+
* This shouldn't ever happen, but we keep the case to avoid a
992+
* compiler warning without a "default" clause in the switch.
993+
*/
994+
Assert(false);
909995
break;
910996
}
997+
911998
return true;
912999
}
9131000

@@ -1011,7 +1098,7 @@ EventTriggerSQLDropAddObject(ObjectAddress *object)
10111098
if (!currentEventTriggerState)
10121099
return;
10131100

1014-
Assert(EventTriggerSupportsObjectType(getObjectClass(object)));
1101+
Assert(EventTriggerSupportsObjectClass(getObjectClass(object)));
10151102

10161103
/* don't report temp schemas */
10171104
if (object->classId==NamespaceRelationId&&

‎src/include/commands/event_trigger.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#ifndefEVENT_TRIGGER_H
1414
#defineEVENT_TRIGGER_H
1515

16+
#include"catalog/dependency.h"
1617
#include"catalog/objectaddress.h"
1718
#include"catalog/pg_event_trigger.h"
1819
#include"nodes/parsenodes.h"
@@ -41,6 +42,7 @@ extern Oid AlterEventTriggerOwner(const char *name, Oid newOwnerId);
4142
externvoidAlterEventTriggerOwner_oid(Oid,OidnewOwnerId);
4243

4344
externboolEventTriggerSupportsObjectType(ObjectTypeobtype);
45+
externboolEventTriggerSupportsObjectClass(ObjectClassobjclass);
4446
externvoidEventTriggerDDLCommandStart(Node*parsetree);
4547
externvoidEventTriggerDDLCommandEnd(Node*parsetree);
4648
externvoidEventTriggerSQLDrop(Node*parsetree);

0 commit comments

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