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/commands/copy.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/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 8c588086863..73677be59e0 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -2506,8 +2506,7 @@ CopyFrom(CopyState cstate) for (;;) { - TupleTableSlot *slot, - *oldslot; + TupleTableSlot *slot; bool skip_tuple; Oid loaded_oid = InvalidOid; @@ -2549,7 +2548,6 @@ CopyFrom(CopyState cstate) ExecStoreTuple(tuple, slot, InvalidBuffer, false); /* Determine the partition to heap_insert the tuple into */ - oldslot = slot; if (cstate->partition_dispatch_info) { int leaf_part_index; @@ -2651,7 +2649,7 @@ CopyFrom(CopyState cstate) /* Check the constraints of the tuple */ if (cstate->rel->rd_att->constr || resultRelInfo->ri_PartitionCheck) - ExecConstraints(resultRelInfo, slot, oldslot, estate); + ExecConstraints(resultRelInfo, slot, estate); if (useHeapMultiInsert) { |