diff options
| author | Robert Haas <rhaas@postgresql.org> | 2018-05-01 13:21:46 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2018-05-01 13:21:46 -0400 |
| commit | 37a3058bc7c8224d4c0d8b36176d821636a1f90e (patch) | |
| tree | 1410ad72fa6d03214b0354a904a75b283c22998a /contrib/postgres_fdw/postgres_fdw.h | |
| parent | 6594ee280383b7548b006e7f96c8d06137fced57 (diff) | |
| download | postgresql-37a3058bc7c8224d4c0d8b36176d821636a1f90e.tar.gz postgresql-37a3058bc7c8224d4c0d8b36176d821636a1f90e.zip | |
Fix interaction of foreign tuple routing with remote triggers.
Without these fixes, changes to the inserted tuple made by remote
triggers are ignored when building local RETURNING tuples.
In the core code, call ExecInitRoutingInfo at a later point from
within ExecInitPartitionInfo so that the FDW callback gets invoked
after the returning list has been built. But move CheckValidResultRel
out of ExecInitRoutingInfo so that it can happen at an earlier stage.
In postgres_fdw, refactor assorted deparsing functions to work with
the RTE rather than the PlannerInfo, which saves us having to
construct a fake PlannerInfo in cases where we don't have a real one.
Then, we can pass down a constructed RTE that yields the correct
deparse result when no real one exists. Unfortunately, this
necessitates a hack that understands how the core code manages RT
indexes for update tuple routing, which is ugly, but we don't have a
better idea right now.
Original report, analysis, and patch by Etsuro Fujita. Heavily
refactored by me. Then worked over some more by Amit Langote.
Discussion: http://postgr.es/m/5AD4882B.10002@lab.ntt.co.jp
Diffstat (limited to 'contrib/postgres_fdw/postgres_fdw.h')
| -rw-r--r-- | contrib/postgres_fdw/postgres_fdw.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h index d37cc88b6ec..a5d4011e8de 100644 --- a/contrib/postgres_fdw/postgres_fdw.h +++ b/contrib/postgres_fdw/postgres_fdw.h @@ -140,11 +140,11 @@ extern void classifyConditions(PlannerInfo *root, extern bool is_foreign_expr(PlannerInfo *root, RelOptInfo *baserel, Expr *expr); -extern void deparseInsertSql(StringInfo buf, PlannerInfo *root, +extern void deparseInsertSql(StringInfo buf, RangeTblEntry *rte, Index rtindex, Relation rel, List *targetAttrs, bool doNothing, List *returningList, List **retrieved_attrs); -extern void deparseUpdateSql(StringInfo buf, PlannerInfo *root, +extern void deparseUpdateSql(StringInfo buf, RangeTblEntry *rte, Index rtindex, Relation rel, List *targetAttrs, List *returningList, List **retrieved_attrs); @@ -157,7 +157,7 @@ extern void deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root, List **params_list, List *returningList, List **retrieved_attrs); -extern void deparseDeleteSql(StringInfo buf, PlannerInfo *root, +extern void deparseDeleteSql(StringInfo buf, RangeTblEntry *rte, Index rtindex, Relation rel, List *returningList, List **retrieved_attrs); |