diff options
| author | Robert Haas <rhaas@postgresql.org> | 2017-04-10 12:20:08 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2017-04-10 12:20:08 -0400 |
| commit | c0a8ae7be392aa09dd7e148ff662013e8e148893 (patch) | |
| tree | c2c280cf4d22b8f4a056247fbce70db8d14f224b /src/include/executor | |
| parent | 244f1c89070c1a661623bf1eaddf1307f8f598a3 (diff) | |
| download | postgresql-c0a8ae7be392aa09dd7e148ff662013e8e148893.tar.gz | |
Fix reporting of violations in ExecConstraints, again.
We decided in f1b4c771ea74f42447dccaed42ffcdcccf3aa694 to pass the
original slot to ExecConstraints(), but that breaks when there are
BEFORE ROW triggers involved. So we need to do reverse-map the tuples
back to the original descriptor instead, as Amit originally proposed.
Amit Langote, reviewed by Ashutosh Bapat. One overlooked comment
fixed by me.
Discussion: http://postgr.es/m/b3a17254-6849-e542-2353-bde4e880b6a4@lab.ntt.co.jp
Diffstat (limited to 'src/include/executor')
| -rw-r--r-- | src/include/executor/executor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index d3849b93eb..f7f3189a1a 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -186,8 +186,7 @@ extern void InitResultRelInfo(ResultRelInfo *resultRelInfo, extern ResultRelInfo *ExecGetTriggerResultRel(EState *estate, Oid relid); extern bool ExecContextForcesOids(PlanState *planstate, bool *hasoids); extern void ExecConstraints(ResultRelInfo *resultRelInfo, - TupleTableSlot *slot, TupleTableSlot *orig_slot, - EState *estate); + TupleTableSlot *slot, EState *estate); extern void ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo, TupleTableSlot *slot, EState *estate); extern LockTupleMode ExecUpdateLockMode(EState *estate, ResultRelInfo *relinfo); |