git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml

index ebb984a994e803549c91081fcbfd107ed350f35a..3c52d90d3ab6926e84775dcacdf73d6e102ba1b6 100644 (file)

--- a/doc/src/sgml/func.sgml

+++ b/doc/src/sgml/func.sgml

<tbody>

<row>

- <entry role="func_table_entry"><para role="func_signature">

+ <entry id="merge-action" role="func_table_entry"><para role="func_signature">

<indexterm>

<primary>merge_action</primary>

</indexterm>

- <function id="merge_action">merge_action</function> ( )

+ <function>merge_action</function> ( )

<returnvalue>text</returnvalue>

</para>

<para>

diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml

index 71feb6634f5421a4a5e7b74bde199b638d96fc49..44e5ec080d25cc14b6bba57285db82f6245737d3 100644 (file)

--- a/doc/src/sgml/ref/merge.sgml

+++ b/doc/src/sgml/ref/merge.sgml

The optional <literal>RETURNING</literal> clause causes <command>MERGE</command>

to compute and return value(s) based on each row inserted, updated, or

deleted. Any expression using the source or target table's columns, or

- the <xref linkend="merge_action"/> function can be computed. When an

- <command>INSERT</command> or <command>UPDATE</command> action is performed,

- the new values of the target table's columns are used. When a

- <command>DELETE</command> is performed, the old values of the target table's

- columns are used. The syntax of the <literal>RETURNING</literal> list is

- identical to that of the output list of <command>SELECT</command>.

+ the <link linkend="merge-action"><function>merge_action()</function></link>

+ function can be computed. When an <command>INSERT</command> or

+ <command>UPDATE</command> action is performed, the new values of the target

+ table's columns are used. When a <command>DELETE</command> is performed,

+ the old values of the target table's columns are used. The syntax of the

+ <literal>RETURNING</literal> list is identical to that of the output list

+ of <command>SELECT</command>.

</para>

<para>

An expression to be computed and returned by the <command>MERGE</command>

command after each row is changed (whether inserted, updated, or deleted).

The expression can use any columns of the source or target tables, or the

- <xref linkend="merge_action"/> function to return additional information

- about the action executed.

+ <link linkend="merge-action"><function>merge_action()</function></link>

+ function to return additional information about the action executed.

</para>

<para>

Writing <literal>*</literal> will return all columns from the source