database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Fix reporting of violations in ExecConstraints, again.

Browse Source 
We decided in f1b4c771ea 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
This commit is contained in:
Robert Haas
2017-04-10 12:20:08 -04:00
parent 244f1c8907
commit c0a8ae7be3
7 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/commands/copy.c
View File

@ -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)
{