diff options
| author | Dean Rasheed <dean.a.rasheed@gmail.com> | 2024-06-04 09:29:42 +0100 |
|---|---|---|
| committer | Dean Rasheed <dean.a.rasheed@gmail.com> | 2024-06-04 09:29:42 +0100 |
| commit | 5c5bccef211cfc98e0d6c4bc1af40a33c8ac2488 (patch) | |
| tree | ca26fb17d51d67cb0fed6835a93d4be9cef02ce5 /src | |
| parent | 83fc61ccfaf38aebe73eacdfc712106797d75b39 (diff) | |
| download | postgresql-5c5bccef211cfc98e0d6c4bc1af40a33c8ac2488.tar.gz postgresql-5c5bccef211cfc98e0d6c4bc1af40a33c8ac2488.zip | |
Fix another couple of outdated comments for MERGE RETURNING.
Oversights in c649fa24a4 which added RETURNING support to MERGE.
Discussion: https://postgr.es/m/CAApHDvpqp6vtUzG-_josUEiBGyqnrnVxJ-VdF+hJLXjHdHzsyQ@mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 2 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 2 | ||||
| -rw-r--r-- | src/include/utils/portal.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 9618619762b..653685bffc5 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -6016,7 +6016,7 @@ get_basic_select_query(Query *query, deparse_context *context, /* ---------- * get_target_list - Parse back a SELECT target list * - * This is also used for RETURNING lists in INSERT/UPDATE/DELETE. + * This is also used for RETURNING lists in INSERT/UPDATE/DELETE/MERGE. * * resultDesc and colNamesVisible are as for get_query_def() * ---------- diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index ddfed02db22..85a62b538e5 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -154,7 +154,7 @@ typedef struct Query bool hasDistinctOn pg_node_attr(query_jumble_ignore); /* WITH RECURSIVE was specified */ bool hasRecursive pg_node_attr(query_jumble_ignore); - /* has INSERT/UPDATE/DELETE in WITH */ + /* has INSERT/UPDATE/DELETE/MERGE in WITH */ bool hasModifyingCTE pg_node_attr(query_jumble_ignore); /* FOR [KEY] UPDATE/SHARE was specified */ bool hasForUpdate pg_node_attr(query_jumble_ignore); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 535928613f1..11419faecaa 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -64,9 +64,9 @@ * supports holdable cursors (the Executor results can be dumped into a * tuplestore for access after transaction completion). * - * PORTAL_ONE_RETURNING: the portal contains a single INSERT/UPDATE/DELETE - * query with a RETURNING clause (plus possibly auxiliary queries added by - * rule rewriting). On first execution, we run the portal to completion + * PORTAL_ONE_RETURNING: the portal contains a single INSERT/UPDATE/DELETE/ + * MERGE query with a RETURNING clause (plus possibly auxiliary queries added + * by rule rewriting). On first execution, we run the portal to completion * and dump the primary query's results into the portal tuplestore; the * results are then returned to the client as demanded. (We can't support * suspension of the query partway through, because the AFTER TRIGGER code |