diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-06-18 19:37:23 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-06-18 19:37:23 -0400 |
| commit | e8c9fd5fdf768323911f7088e8287f63b513c3c6 (patch) | |
| tree | 381453098ccf289a6aa30934ddafd20ed432439e /src/backend/utils/adt/ri_triggers.c | |
| parent | 03a5ba24b096a9acbbc9682adc0a27d1db31c570 (diff) | |
| download | postgresql-e8c9fd5fdf768323911f7088e8287f63b513c3c6.tar.gz postgresql-e8c9fd5fdf768323911f7088e8287f63b513c3c6.zip | |
Allow ON UPDATE/DELETE SET DEFAULT plans to be cached.
Once upon a time, somebody was worried that cached RI plans wouldn't get
remade with new default values after ALTER TABLE ... SET DEFAULT, so they
didn't allow caching of plans for ON UPDATE/DELETE SET DEFAULT actions.
That time is long gone, though (and even at the time I doubt this was the
greatest hazard posed by ALTER TABLE...). So allow these triggers to cache
their plans just like the others.
The cache_plan argument to ri_PlanCheck is now vestigial, since there
are no callers that don't pass "true"; but I left it alone in case there
is any future need for it.
Diffstat (limited to 'src/backend/utils/adt/ri_triggers.c')
| -rw-r--r-- | src/backend/utils/adt/ri_triggers.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index cd1bb262a35..5b439aab6fb 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -2155,12 +2155,12 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) elog(ERROR, "SPI_connect failed"); /* - * Prepare a plan for the set default delete operation. - * Unfortunately we need to do it on every invocation because the - * default value could potentially change between calls. + * Fetch or prepare a saved plan for the set default delete + * operation */ ri_BuildQueryKey(&qkey, &riinfo, RI_PLAN_SETDEFAULT_DEL_DOUPDATE); + if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL) { StringInfoData querybuf; StringInfoData qualbuf; @@ -2207,9 +2207,9 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) } appendStringInfoString(&querybuf, qualbuf.data); - /* Prepare the plan, don't save it */ + /* Prepare and save the plan */ qplan = ri_PlanCheck(querybuf.data, riinfo.nkeys, queryoids, - &qkey, fk_rel, pk_rel, false); + &qkey, fk_rel, pk_rel, true); } /* @@ -2239,7 +2239,7 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); /* - * Handle MATCH PARTIAL set null delete. + * Handle MATCH PARTIAL set default delete. */ case FKCONSTR_MATCH_PARTIAL: ereport(ERROR, @@ -2348,12 +2348,12 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) elog(ERROR, "SPI_connect failed"); /* - * Prepare a plan for the set default delete operation. - * Unfortunately we need to do it on every invocation because the - * default value could potentially change between calls. + * Fetch or prepare a saved plan for the set default update + * operation */ ri_BuildQueryKey(&qkey, &riinfo, RI_PLAN_SETDEFAULT_UPD_DOUPDATE); + if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL) { StringInfoData querybuf; StringInfoData qualbuf; @@ -2400,9 +2400,9 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) } appendStringInfoString(&querybuf, qualbuf.data); - /* Prepare the plan, don't save it */ + /* Prepare and save the plan */ qplan = ri_PlanCheck(querybuf.data, riinfo.nkeys, queryoids, - &qkey, fk_rel, pk_rel, false); + &qkey, fk_rel, pk_rel, true); } /* @@ -2432,7 +2432,7 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); /* - * Handle MATCH PARTIAL set null delete. + * Handle MATCH PARTIAL set default update. */ case FKCONSTR_MATCH_PARTIAL: ereport(ERROR, |