Commit5c5bcce

committed

Fix another couple of outdated comments for MERGE RETURNING.

1 parent83fc61c commit5c5bcceCopy full SHA for 5c5bcce

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6016,7 +6016,7 @@ get_basic_select_query(Query query, deparse_context context,`
`6016`	`6016`	`/* ----------`
`6017`	`6017`	`* get_target_list- Parse back a SELECT target list`
`6018`	`6018`	`*`
`6019`		`- * This is also used for RETURNING lists in INSERT/UPDATE/DELETE.`
	`6019`	`+ * This is also used for RETURNING lists in INSERT/UPDATE/DELETE/MERGE.`
`6020`	`6020`	`*`
`6021`	`6021`	`* resultDesc and colNamesVisible are as for get_query_def()`
`6022`	`6022`	`* ----------`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ typedef struct Query`
`154`	`154`	`boolhasDistinctOnpg_node_attr(query_jumble_ignore);`
`155`	`155`	`/* WITH RECURSIVE was specified */`
`156`	`156`	`boolhasRecursivepg_node_attr(query_jumble_ignore);`
`157`		`-/* has INSERT/UPDATE/DELETE in WITH */`
	`157`	`+/* has INSERT/UPDATE/DELETE/MERGE in WITH */`
`158`	`158`	`boolhasModifyingCTEpg_node_attr(query_jumble_ignore);`
`159`	`159`	`/* FOR [KEY] UPDATE/SHARE was specified */`
`160`	`160`	`boolhasForUpdatepg_node_attr(query_jumble_ignore);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@`
`64`	`64`	`* supports holdable cursors (the Executor results can be dumped into a`
`65`	`65`	`* tuplestore for access after transaction completion).`
`66`	`66`	`*`
`67`		`- * PORTAL_ONE_RETURNING: the portal contains a single INSERT/UPDATE/DELETE`
`68`		`- * query with a RETURNING clause (plus possibly auxiliary queries added by`
`69`		`- * rule rewriting). On first execution, we run the portal to completion`
	`67`	`+ * PORTAL_ONE_RETURNING: the portal contains a single INSERT/UPDATE/DELETE/`
	`68`	`+ *MERGEquery with a RETURNING clause (plus possibly auxiliary queries added`
	`69`	`+ *byrule rewriting). On first execution, we run the portal to completion`
`70`	`70`	`* and dump the primary query's results into the portal tuplestore; the`
`71`	`71`	`* results are then returned to the client as demanded. (We can't support`
`72`	`72`	`* suspension of the query partway through, because the AFTER TRIGGER code`

Comments

(0)