Commit7b2ccc5

committed

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

1 parentb1d0158 commit7b2ccc5Copy full SHA for 7b2ccc5

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,8 @@ transformMergeStmt(ParseState pstate, MergeStmt stmt)`
`182`	`182`	`errmsg("cannot execute MERGE on relation \"%s\"",`
`183`	`183`	`RelationGetRelationName(pstate->p_target_relation)),`
`184`	`184`	`errdetail_relkind_not_supported(pstate->p_target_relation->rd_rel->relkind)));`
`185`		`-if (pstate->p_target_relation->rd_rel->relhasrules)`
	`185`	`+if (pstate->p_target_relation->rd_rules!=NULL&&`
	`186`	`+pstate->p_target_relation->rd_rules->numLocks>0)`
`186`	`187`	`ereport(ERROR,`
`187`	`188`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`188`	`189`	`errmsg("cannot execute MERGE on relation \"%s\"",`

Comments

(0)