Follow addition of NextCopyFrom()'s parameter.

1 files changed, 8 insertions, 2 deletions

diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 410b0a9ec2..ddc91603b4 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -436,10 +436,16 @@ fileIterate(FdwExecutionState *festate, TupleTableSlot *slot)
 	 * If next tuple has been found, store it into the slot as materialized
 	 * tuple.  Otherwise, clear the slot to tell executor that we have reached
 	 * EOF.
+	 *
+	 * We pass NULL as ExprContext for evaluating default expression because we
+	 * read all of data from file.
+	 *
+	 * We also pass NULL as tupleOid because we don't support tuple oid for
+	 * foreign tables.
 	 */
 	ExecClearTuple(slot);
-	found = NextCopyFrom(fdw_private->cstate, slot->tts_values, slot->tts_isnull,
-						 NULL);
+	found = NextCopyFrom(fdw_private->cstate, NULL, slot->tts_values,
+						 slot->tts_isnull, NULL);
 	if (found)
 		ExecStoreVirtualTuple(slot);