From a69b12264469541b3e6c90ce4fead76460687e68 Mon Sep 17 00:00:00 2001 From: Arseny Sher Date: Thu, 19 Jul 2018 07:37:06 +0300 Subject: [PATCH] Fix shardman's COPY FROM as it got a bit rotten in the 'next' branch --- src/utility_stmt_hooking.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c index 553f7c8e..fcd6a1dc 100644 --- a/src/utility_stmt_hooking.c +++ b/src/utility_stmt_hooking.c @@ -630,9 +630,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel, /* Handle foreign tables */ else { - child_result_rel->ri_FdwRoutine->ForeignNextCopyFrom(estate, - child_rri, - cstate); + child_rri->ri_FdwRoutine->ForeignNextCopyFrom(estate, + child_rri, + cstate); } #endif @@ -706,7 +706,7 @@ prepare_rri_for_copy(ResultRelInfoHolder *rri_holder, FdwCopyFromIsSupported(fdw_routine)) { CopyState cstate = (CopyState) rps_storage->init_rri_holder_cb_arg; - ResultRelInfo *parent_rri = rps_storage->saved_rel_info; + ResultRelInfo *parent_rri = rps_storage->base_rri; EState *estate = rps_storage->estate; fdw_routine->BeginForeignCopyFrom(estate, rri, cstate, parent_rri);