Restore RI trigger sanity check

alvherre · alvherre · commit 04f9b449aa30 · 2019-03-20T17:23:26.000-03:00
I unnecessarily removed this check in 3de241d because I misunderstood what the final representation of constraints across a partitioning hierarchy was to be. Put it back (in both branches). Discussion: https://postgr.es/m/201901222145.t6wws6t6vrcu@alvherre.pgsql
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
@@ -2320,6 +2320,13 @@ ri_FetchConstraintInfo(Trigger *trigger, Relation trig_rel, bool rel_is_pk)
 			elog(ERROR, "wrong pg_constraint entry for trigger \"%s\" on table \"%s\"",
 				 trigger->tgname, RelationGetRelationName(trig_rel));
 	}
+	else
+	{
+		if (riinfo->fk_relid != RelationGetRelid(trig_rel) ||
+			riinfo->pk_relid != trigger->tgconstrrelid)
+			elog(ERROR, "wrong pg_constraint entry for trigger \"%s\" on table \"%s\"",
+				 trigger->tgname, RelationGetRelationName(trig_rel));
+	}
 
 	return riinfo;
 }

Original file line number	Diff line number	Diff line change
`@@ -2320,6 +2320,13 @@ ri_FetchConstraintInfo(Trigger *trigger, Relation trig_rel, bool rel_is_pk)`
`2320`	`2320`	`elog(ERROR, "wrong pg_constraint entry for trigger \"%s\" on table \"%s\"",`
`2321`	`2321`	`trigger->tgname, RelationGetRelationName(trig_rel));`
`2322`	`2322`	`}`
	`2323`	`+ else`
	`2324`	`+ {`
	`2325`	`+ if (riinfo->fk_relid != RelationGetRelid(trig_rel) \|\|`
	`2326`	`+ riinfo->pk_relid != trigger->tgconstrrelid)`
	`2327`	`+ elog(ERROR, "wrong pg_constraint entry for trigger \"%s\" on table \"%s\"",`
	`2328`	`+ trigger->tgname, RelationGetRelationName(trig_rel));`
	`2329`	`+ }`
`2323`	`2330`
`2324`	`2331`	`return riinfo;`
`2325`	`2332`	`}`