diff options
author | Andres Freund <andres@anarazel.de> | 2017-01-19 14:12:38 -0800 |
---|---|---|
committer | Andres Freund <andres@anarazel.de> | 2017-01-19 14:40:41 -0800 |
commit | ea15e18677fc2eff3135023e27f69ed8821554ed (patch) | |
tree | b6a3d56b7603b96a5841681f0121171844a1c41c /src/backend/executor/nodeModifyTable.c | |
parent | 8eace46d34ab6ac0d887aa4d3504bc4222c2e448 (diff) | |
download | postgresql-ea15e18677fc2eff3135023e27f69ed8821554ed.tar.gz postgresql-ea15e18677fc2eff3135023e27f69ed8821554ed.zip |
Remove obsoleted code relating to targetlist SRF evaluation.
Since 69f4b9c plain expression evaluation (and thus normal projection)
can't return sets of tuples anymore. Thus remove code dealing with
that possibility.
This will require adjustments in external code using
ExecEvalExpr()/ExecProject() - that should neither be hard nor very
common.
Author: Andres Freund and Tom Lane
Discussion: https://postgr.es/m/20160822214023.aaxz5l4igypowyri@alap3.anarazel.de
Diffstat (limited to 'src/backend/executor/nodeModifyTable.c')
-rw-r--r-- | src/backend/executor/nodeModifyTable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 982f15d490e..2ac74073186 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -175,7 +175,7 @@ ExecProcessReturning(ResultRelInfo *resultRelInfo, econtext->ecxt_outertuple = planSlot; /* Compute the RETURNING expressions */ - return ExecProject(projectReturning, NULL); + return ExecProject(projectReturning); } /* @@ -1300,7 +1300,7 @@ ExecOnConflictUpdate(ModifyTableState *mtstate, } /* Project the new tuple version */ - ExecProject(resultRelInfo->ri_onConflictSetProj, NULL); + ExecProject(resultRelInfo->ri_onConflictSetProj); /* * Note that it is possible that the target tuple has been modified in |