Commitc85ec64

committed

Reverse-convert row types in ExecWithCheckOptions.

Just as we already do in ExecConstraints, and for the same reason:to improve the quality of error messages.Etsuro Fujita, reviewed by Amit LangoteDiscussion:http://postgr.es/m/56e0baa8-e458-2bbb-7936-367f7d832e43@lab.ntt.co.jp

1 parentf81a91d commitc85ec64Copy full SHA for c85ec64

File tree

+20

-1

lines changed

src
- backend/executor
  - execMain.c
- test/regress/expected
  - updatable_views.out

+20

-1

lines changed

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2097,6 +2097,25 @@ ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo,`
`2097`	`2097`	`* USING policy.`
`2098`	`2098`	`*/`
`2099`	`2099`	`caseWCO_VIEW_CHECK:`
	`2100`	`+/* See the comment in ExecConstraints(). */`
	`2101`	`+if (resultRelInfo->ri_PartitionRoot)`
	`2102`	`+{`
	`2103`	`+HeapTupletuple=ExecFetchSlotTuple(slot);`
	`2104`	`+TupleDescold_tupdesc=RelationGetDescr(rel);`
	`2105`	`+TupleConversionMap*map;`
	`2106`	`+`
	`2107`	`+rel=resultRelInfo->ri_PartitionRoot;`
	`2108`	`+tupdesc=RelationGetDescr(rel);`
	`2109`	`+/* a reverse map */`
	`2110`	`+map=convert_tuples_by_name(old_tupdesc,tupdesc,`
	`2111`	`+gettext_noop("could not convert row type"));`
	`2112`	`+if (map!=NULL)`
	`2113`	`+{`
	`2114`	`+tuple=do_convert_tuple(tuple,map);`
	`2115`	`+ExecStoreTuple(tuple,slot,InvalidBuffer, false);`
	`2116`	`+}`
	`2117`	`+}`
	`2118`	`+`
`2100`	`2119`	`insertedCols=GetInsertedColumns(resultRelInfo,estate);`
`2101`	`2120`	`updatedCols=GetUpdatedColumns(resultRelInfo,estate);`
`2102`	`2121`	`modifiedCols=bms_union(insertedCols,updatedCols);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2424,6 +2424,6 @@ select tableoid::regclass, * from pt;`
`2424`	`2424`	`create view ptv_wco as select * from pt where a = 0 with check option;`
`2425`	`2425`	`insert into ptv_wco values (1, 2);`
`2426`	`2426`	`ERROR: new row violates check option for view "ptv_wco"`
`2427`		`-DETAIL: Failing row contains (2, 1).`
	`2427`	`+DETAIL: Failing row contains (1, 2).`
`2428`	`2428`	`drop view ptv, ptv_wco;`
`2429`	`2429`	`drop table pt, pt1, pt11;`

Comments

(0)