database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix PDF doc generation.

Browse Source 
Commit c649fa24a4 broke PDF generation, due to a misplaced id
attribute.

Per buildfarm member crake.
This commit is contained in:
Dean Rasheed
2024-03-17 14:48:39 +00:00
parent c649fa24a4
commit 7eb9a82018
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/func.sgml
View File

@ -22453,11 +22453,11 @@ SELECT count(*) FROM sometable;
<tbody> <tbody>
<row> <row>
<entry role="func_table_entry"><para role="func_signature"> <entry id="merge-action" role="func_table_entry"><para role="func_signature">
<indexterm> <indexterm>
<primary>merge_action</primary> <primary>merge_action</primary>
</indexterm> </indexterm>
<function id="merge_action">merge_action</function> ( ) <function>merge_action</function> ( )
<returnvalue>text</returnvalue> <returnvalue>text</returnvalue>
</para> </para>
<para> <para>

17
doc/src/sgml/ref/merge.sgml
View File

@ -101,12 +101,13 @@ DELETE
The optional <literal>RETURNING</literal> clause causes <command>MERGE</command> The optional <literal>RETURNING</literal> clause causes <command>MERGE</command>
to compute and return value(s) based on each row inserted, updated, or 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 deleted. Any expression using the source or target table's columns, or
the <xref linkend="merge_action"/> function can be computed. When an the <link linkend="merge-action"><function>merge_action()</function></link>
<command>INSERT</command> or <command>UPDATE</command> action is performed, function can be computed. When an <command>INSERT</command> or
the new values of the target table's columns are used. When a <command>UPDATE</command> action is performed, the new values of the target
<command>DELETE</command> is performed, the old values of the target table's table's columns are used. When a <command>DELETE</command> is performed,
columns are used. The syntax of the <literal>RETURNING</literal> list is the old values of the target table's columns are used. The syntax of the
identical to that of the output list of <command>SELECT</command>. <literal>RETURNING</literal> list is identical to that of the output list
of <command>SELECT</command>.
</para> </para>
<para> <para>
@ -462,8 +463,8 @@ DELETE
An expression to be computed and returned by the <command>MERGE</command> An expression to be computed and returned by the <command>MERGE</command>
command after each row is changed (whether inserted, updated, or deleted). 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 The expression can use any columns of the source or target tables, or the
<xref linkend="merge_action"/> function to return additional information <link linkend="merge-action"><function>merge_action()</function></link>
about the action executed. function to return additional information about the action executed.
</para> </para>
<para> <para>
Writing <literal>*</literal> will return all columns from the source Writing <literal>*</literal> will return all columns from the source