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/backend/executor/execReplication.c | |
| parent | 244f1c89070c1a661623bf1eaddf1307f8f598a3 (diff) | |
| download | postgresql-c0a8ae7be392aa09dd7e148ff662013e8e148893.tar.gz postgresql-c0a8ae7be392aa09dd7e148ff662013e8e148893.zip | |
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/backend/executor/execReplication.c')
| -rw-r--r-- | src/backend/executor/execReplication.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index f20d728ad5a..327a0bad388 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -389,7 +389,7 @@ ExecSimpleRelationInsert(EState *estate, TupleTableSlot *slot) /* Check the constraints of the tuple */ if (rel->rd_att->constr) - ExecConstraints(resultRelInfo, slot, slot, estate); + ExecConstraints(resultRelInfo, slot, estate); /* Store the slot into tuple that we can inspect. */ tuple = ExecMaterializeSlot(slot); @@ -448,7 +448,7 @@ ExecSimpleRelationUpdate(EState *estate, EPQState *epqstate, /* Check the constraints of the tuple */ if (rel->rd_att->constr) - ExecConstraints(resultRelInfo, slot, slot, estate); + ExecConstraints(resultRelInfo, slot, estate); /* Store the slot into tuple that we can write. */ tuple = ExecMaterializeSlot(slot); |