Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6634769

Browse files
author
Neil Conway
committed
Minor tweaks for PL/PgSQL documentation.
1 parent9ea14ef commit6634769

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

‎doc/src/sgml/plpgsql.sgml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.76 2005/09/14 21:14:26 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.77 2005/10/06 20:51:20 neilc Exp $
33
-->
44

55
<chapter id="plpgsql">
@@ -1593,9 +1593,10 @@ SELECT * FROM some_func();
15931593
allow users to define set-returning functions
15941594
that do not have this limitation. Currently, the point at
15951595
which data begins being written to disk is controlled by the
1596-
<varname>work_mem</> configuration variable. Administrators
1597-
who have sufficient memory to store larger result sets in
1598-
memory should consider increasing this parameter.
1596+
<xref linkend="guc-work-mem" xreflabel="work_mem">
1597+
configuration variable. Administrators who have sufficient
1598+
memory to store larger result sets in memory should consider
1599+
increasing this parameter.
15991600
</para>
16001601
</note>
16011602
</sect3>
@@ -2122,14 +2123,13 @@ END;
21222123
</para>
21232124

21242125
<para>
2125-
The <replaceable>condition</replaceable> names can be any of those
2126-
shown in <xref linkend="errcodes-appendix">. A category name matches
2127-
any error within its category.
2128-
The special condition name <literal>OTHERS</>
2129-
matches every error type except <literal>QUERY_CANCELED</>.
2130-
(It is possible, but often unwise, to trap
2131-
<literal>QUERY_CANCELED</> by name.)
2132-
Condition names are not case-sensitive.
2126+
The <replaceable>condition</replaceable> names can be any of
2127+
those shown in <xref linkend="errcodes-appendix">. A category
2128+
name matches any error within its category. The special
2129+
condition name <literal>OTHERS</> matches every error type except
2130+
<literal>QUERY_CANCELED</>. (It is possible, but often unwise,
2131+
to trap <literal>QUERY_CANCELED</> by name.) Condition names are
2132+
not case-sensitive.
21332133
</para>
21342134

21352135
<para>
@@ -2188,15 +2188,16 @@ END;
21882188
</para>
21892189

21902190
<example id="plpgsql-upsert-example">
2191-
<title>Exceptions with UPDATE/INSERT</title>
2191+
<title>Exceptions with<command>UPDATE</>/<command>INSERT</></title>
21922192
<para>
2193-
This example uses an <literal>EXCEPTION</> to <command>UPDATE</> or
2194-
<command>INSERT</>, as appropriate.
2193+
2194+
This example uses exception handling to perform either
2195+
<command>UPDATE</> or <command>INSERT</>, as appropriate.
21952196

21962197
<programlisting>
21972198
CREATE TABLE db (a INT PRIMARY KEY, b TEXT);
21982199

2199-
CREATE FUNCTION merge_db(key INT, data TEXT) RETURNS VOID AS
2200+
CREATE FUNCTION merge_db(key INT, data TEXT) RETURNS VOID AS
22002201
$$
22012202
BEGIN
22022203
LOOP
@@ -2216,8 +2217,8 @@ END;
22162217
$$
22172218
LANGUAGE plpgsql;
22182219

2219-
SELECT merge_db(1, 'david');
2220-
SELECT merge_db(1, 'dennis');
2220+
SELECT merge_db(1, 'david');
2221+
SELECT merge_db(1, 'dennis');
22212222
</programlisting>
22222223

22232224
</para>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp