From 7289a0706d95aa621b9d6f626a836ac381fd4f61 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 7 Sep 2020 19:26:37 -0300 Subject: [PATCH] Avoid invalid RRI --- src/backend/executor/execMain.c | 7 +++++++ src/backend/executor/execPartition.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 4fdffad6f3..a0c3e56a03 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1840,6 +1840,12 @@ ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo, * back to the root table's rowtype so that val_desc in the error message * matches the input tuple. */ + if (resultRelInfo->ri_RangeTableIndex == 0) + { + val_desc = NULL; + } + else + { if (resultRelInfo->ri_PartitionRoot) { TupleDesc old_tupdesc; @@ -1874,6 +1880,7 @@ ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo, tupdesc, modifiedCols, 64); + } ereport(ERROR, (errcode(ERRCODE_CHECK_VIOLATION), errmsg("new row for relation \"%s\" violates partition constraint", diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c index 0ca1d34dfa..c1ef34d771 100644 --- a/src/backend/executor/execPartition.c +++ b/src/backend/executor/execPartition.c @@ -1111,7 +1111,7 @@ ExecInitPartitionDispatchInfo(EState *estate, { ResultRelInfo *rri = makeNode(ResultRelInfo); - InitResultRelInfo(rri, rel, 1, proute->partition_root, 0); + InitResultRelInfo(rri, rel, 0, proute->partition_root, 0); proute->nonleaf_partitions[dispatchidx] = rri; } else -- 2.20.1