postgres.git / summary / log / commit / refs

commit    21234170dc6c8dab99580f34e29d61764df71d3d
Author:   Dean Rasheed <dean.a.rasheed@gmail.com>
Date:     Wed Nov 11 12:22:47 2026 +0000
First released in: 19.0

    Fix MERGE into partitioned table with subquery in UPDATE targetlist.
    
    Under some circumstances, a MERGE into a partitioned table with an
    UPDATE action with a subquery in its targetlist would fail with a
    "SubPlan found with no parent plan" error.
    
    This was due to ExecInitPartitionInfo() passing a NULL parent
    PlanState to ExecBuildUpdateProjection() for the MERGE UPDATE action's
    targetlist. Fix by passing &mtstate->ps, like ExecInitMerge().
    
    Backpatch to v15, where MERGE was introduced.
    
    Bug: #19802
    Reported-by: Gowtham Reddy <gowthamdoma18@gmail.com>
    Author: Tender Wang <tndrwang@gmail.com>
    Reviewed-by: Dilip Kumar <dilipbalaut@gmail.com>
    Discussion: https://postgr.es/m/19802-ef50a8f1a4b5deee%40postgresql.org
    Backpatch-through: 15


src/backend/executor/execPartition.c | 2 +- src/test/regress/expected/merge.out | 15 +++++++++++++++ src/test/regress/sql/merge.sql | 11 +++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c index 4b1343d749d..73953eff0fb 100644 --- a/src/backend/executor/execPartition.c +++ b/src/backend/executor/execPartition.c @@ -957,7 +957,7 @@ ExecInitPartitionInfo(ModifyTableState *mtstate, EState *estate, RelationGetDescr(leaf_part_rri->ri_RelationDesc), econtext, leaf_part_rri->ri_newTupleSlot, - NULL); + &mtstate->ps); break; case CMD_DELETE: case CMD_NOTHING: diff --git a/src/test/regress/expected/merge.out b/src/test/regress/expected/merge.out index cf2219df754..ce0d9cdb8e4 100644 --- a/src/test/regress/expected/merge.out +++ b/src/test/regress/expected/merge.out @@ -2307,6 +2307,21 @@ MERGE INTO pa_target t WHEN MATCHED THEN UPDATE SET tid = tid - 1; ERROR: new row violates row-level security policy for table "pa_target" +ROLLBACK; +-- bug #19802: UPDATE of partition with SubPlan in targetlist +BEGIN; +MERGE INTO pa_target t + USING (SELECT true AS c OFFSET 0) s ON t.tid IS NULL + WHEN MATCHED THEN + UPDATE SET val = (SELECT NULL WHERE s.c) + WHEN NOT MATCHED THEN + INSERT VALUES (1, 0, 'subplan test'); +SELECT * FROM pa_target WHERE val = 'subplan test'; + tid | balance | val +-----+---------+-------------- + 1 | 0 | subplan test +(1 row) + ROLLBACK; DROP TABLE pa_source; DROP TABLE pa_target CASCADE; diff --git a/src/test/regress/sql/merge.sql b/src/test/regress/sql/merge.sql index 2660b19f238..0cd50714a2b 100644 --- a/src/test/regress/sql/merge.sql +++ b/src/test/regress/sql/merge.sql @@ -1432,6 +1432,17 @@ MERGE INTO pa_target t UPDATE SET tid = tid - 1; ROLLBACK; +-- bug #19802: UPDATE of partition with SubPlan in targetlist +BEGIN; +MERGE INTO pa_target t + USING (SELECT true AS c OFFSET 0) s ON t.tid IS NULL + WHEN MATCHED THEN + UPDATE SET val = (SELECT NULL WHERE s.c) + WHEN NOT MATCHED THEN + INSERT VALUES (1, 0, 'subplan test'); +SELECT * FROM pa_target WHERE val = 'subplan test'; +ROLLBACK; + DROP TABLE pa_source; DROP TABLE pa_target CASCADE; [parent: 217b33ddc663]