From 1f436fa1112ef01fe11d11cf6c8b308f25a60785 Mon Sep 17 00:00:00 2001 From: Amul Sul Date: Mon, 20 Jan 2025 18:49:41 +0530 Subject: [PATCH v17 3/6] refactor: Pass Relid instead of Relation to createForeignKeyCheckTriggers(). Currently, createForeignKeyCheckTriggers() takes a Relation type as its first argument, but it doesn't use that argument directly. Instead, it fetches the Relid by calling RelationGetRelid(). Therefore, it would be more consistent with other functions (e.g., createForeignKeyCheckTriggers()) to pass the Relid directly instead of the whole Relation. --- src/backend/commands/tablecmds.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index cc462aa831b..ae8c59f8147 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -580,7 +580,7 @@ static void createForeignKeyCheckTriggers(Oid myRelOid, Oid refRelOid, Oid indexOid, Oid parentInsTrigger, Oid parentUpdTrigger, Oid *insertTrigOid, Oid *updateTrigOid); -static void createForeignKeyActionTriggers(Relation rel, Oid refRelOid, +static void createForeignKeyActionTriggers(Oid myRelOid, Oid refRelOid, Constraint *fkconstraint, Oid constraintOid, Oid indexOid, Oid parentDelTrigger, Oid parentUpdTrigger, @@ -10690,7 +10690,8 @@ addFkRecurseReferenced(Constraint *fkconstraint, Relation rel, /* * Create the action triggers that enforce the constraint. */ - createForeignKeyActionTriggers(rel, RelationGetRelid(pkrel), + createForeignKeyActionTriggers(RelationGetRelid(rel), + RelationGetRelid(pkrel), fkconstraint, parentConstr, indexOid, parentDelTrigger, parentUpdTrigger, @@ -13219,10 +13220,11 @@ CreateFKCheckTrigger(Oid myRelOid, Oid refRelOid, Constraint *fkconstraint, * *updateTrigOid. */ static void -createForeignKeyActionTriggers(Relation rel, Oid refRelOid, Constraint *fkconstraint, - Oid constraintOid, Oid indexOid, - Oid parentDelTrigger, Oid parentUpdTrigger, - Oid *deleteTrigOid, Oid *updateTrigOid) +createForeignKeyActionTriggers(Oid myRelOid, Oid refRelOid, + Constraint *fkconstraint, Oid constraintOid, + Oid indexOid, Oid parentDelTrigger, + Oid parentUpdTrigger, Oid *deleteTrigOid, + Oid *updateTrigOid) { CreateTrigStmt *fk_trigger; ObjectAddress trigAddress; @@ -13278,8 +13280,7 @@ createForeignKeyActionTriggers(Relation rel, Oid refRelOid, Constraint *fkconstr break; } - trigAddress = CreateTrigger(fk_trigger, NULL, refRelOid, - RelationGetRelid(rel), + trigAddress = CreateTrigger(fk_trigger, NULL, refRelOid, myRelOid, constraintOid, indexOid, InvalidOid, parentDelTrigger, NULL, true, false); if (deleteTrigOid) @@ -13339,8 +13340,7 @@ createForeignKeyActionTriggers(Relation rel, Oid refRelOid, Constraint *fkconstr break; } - trigAddress = CreateTrigger(fk_trigger, NULL, refRelOid, - RelationGetRelid(rel), + trigAddress = CreateTrigger(fk_trigger, NULL, refRelOid, myRelOid, constraintOid, indexOid, InvalidOid, parentUpdTrigger, NULL, true, false); if (updateTrigOid) -- 2.43.5