From 7b2ccc5e03bf16d1e1bbabca25298108c839ec52 Mon Sep 17 00:00:00 2001 From: Dean Rasheed Date: Fri, 25 Nov 2022 13:31:48 +0000 Subject: [PATCH] Fix rule-detection code for MERGE. Use the relation's rd_rules structure to test whether it has rules, rather than the relhasrules flag, which might be out of date. Reviewed by Tom Lane. Backpatch to 15, where MERGE was added. Discussion: https://postgr.es/m/CAEZATCVkBVZABfw71sYvkcPf6tarcOFST5Bc6AOi-LFT9YdccQ%40mail.gmail.com --- src/backend/parser/parse_merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/parser/parse_merge.c b/src/backend/parser/parse_merge.c index 7913523b1c..62c2ff69f0 100644 --- a/src/backend/parser/parse_merge.c +++ b/src/backend/parser/parse_merge.c @@ -182,7 +182,8 @@ transformMergeStmt(ParseState *pstate, MergeStmt *stmt) errmsg("cannot execute MERGE on relation \"%s\"", RelationGetRelationName(pstate->p_target_relation)), errdetail_relkind_not_supported(pstate->p_target_relation->rd_rel->relkind))); - if (pstate->p_target_relation->rd_rel->relhasrules) + if (pstate->p_target_relation->rd_rules != NULL && + pstate->p_target_relation->rd_rules->numLocks > 0) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("cannot execute MERGE on relation \"%s\"",