Skip to content

Commit 9c8d085

Browse files
tglsfdctglsfdc
committed
Support "OR condition ..." in plpgsql EXCEPTION clauses to make the syntax
more nearly Oracle-equivalent. Allow matching by category as well as specific error code. Document the set of available condition names (or more accurately, synchronize it with the existing documentation). In passing, update errcodes.sgml to include codes added during 7.5 development.
1 parent ad4d2e9 commit 9c8d085

File tree

11 files changed

+350
-89
lines changed

11 files changed

+350
-89
lines changed

‎doc/src/sgml/errcodes.sgml‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/errcodes.sgml,v 1.6 2004/05/16 23:18:52 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/errcodes.sgml,v 1.7 2004/07/31 23:04:54 tgl Exp $ -->
22

33
<appendix id="errcodes-appendix">
44
<title><productname>PostgreSQL</productname> Error Codes</title>
@@ -41,10 +41,18 @@
4141
within the class but do not have any more-specific code assigned.
4242
</para>
4343

44+
<para>
45+
The <application>PL/pgSQL</> condition name for each error code is the
46+
same as the phrase shown in the table, with underscores substituted
47+
for spaces. For example, code <literal>22012</>, DIVISION BY ZERO,
48+
has condition name <literal>DIVISION_BY_ZERO</>. Condition names can
49+
be written in either upper or lower case.
50+
</para>
51+
4452

4553
<!--
4654
The following table should correspond to the contents of
47-
src/include/utils/errcodes.h.
55+
src/include/utils/errcodes.h and src/pl/plpgsql/src/plerrcodes.h.
4856
-->
4957

5058
<table id="errcodes-table">
@@ -82,27 +90,37 @@
8290

8391
<row>
8492
<entry><literal>0100C</literal></entry>
85-
<entry>WARNING DYNAMIC RESULT SETS RETURNED</entry>
93+
<entry>DYNAMIC RESULT SETS RETURNED</entry>
8694
</row>
8795

8896
<row>
8997
<entry><literal>01008</literal></entry>
90-
<entry>WARNING IMPLICIT ZERO BIT PADDING</entry>
98+
<entry>IMPLICIT ZERO BIT PADDING</entry>
9199
</row>
92100

93101
<row>
94102
<entry><literal>01003</literal></entry>
95-
<entry>WARNING NULL VALUE ELIMINATED IN SET FUNCTION</entry>
103+
<entry>NULL VALUE ELIMINATED IN SET FUNCTION</entry>
104+
</row>
105+
106+
<row>
107+
<entry><literal>01007</literal></entry>
108+
<entry>PRIVILEGE NOT GRANTED</entry>
109+
</row>
110+
111+
<row>
112+
<entry><literal>01006</literal></entry>
113+
<entry>PRIVILEGE NOT REVOKED</entry>
96114
</row>
97115

98116
<row>
99117
<entry><literal>01004</literal></entry>
100-
<entry>WARNING STRING DATA RIGHT TRUNCATION</entry>
118+
<entry>STRING DATA RIGHT TRUNCATION</entry>
101119
</row>
102120

103121
<row>
104122
<entry><literal>01P01</literal></entry>
105-
<entry>WARNING DEPRECATED FEATURE</entry>
123+
<entry>DEPRECATED FEATURE</entry>
106124
</row>
107125

108126
<row>
@@ -218,7 +236,7 @@
218236

219237
<row>
220238
<entry><literal>0F001</literal></entry>
221-
<entry>INVALID SPECIFICATION</entry>
239+
<entry>INVALID LOCATOR SPECIFICATION</entry>
222240
</row>
223241

224242

@@ -272,7 +290,7 @@
272290

273291
<row>
274292
<entry><literal>2202E</literal></entry>
275-
<entry>ARRAY ELEMENT ERROR</entry>
293+
<entry>ARRAY SUBSCRIPT ERROR</entry>
276294
</row>
277295

278296
<row>
@@ -728,6 +746,22 @@
728746
</row>
729747

730748

749+
<row>
750+
<entry>Class 3B</entry>
751+
<entry>Savepoint Exception</entry>
752+
</row>
753+
754+
<row>
755+
<entry><literal>3B000</literal></entry>
756+
<entry>SAVEPOINT EXCEPTION</entry>
757+
</row>
758+
759+
<row>
760+
<entry><literal>3B001</literal></entry>
761+
<entry>INVALID SAVEPOINT SPECIFICATION</entry>
762+
</row>
763+
764+
731765
<row>
732766
<entry>Class 3D</entry>
733767
<entry>Invalid Catalog Name</entry>
@@ -762,7 +796,7 @@
762796

763797
<row>
764798
<entry><literal>40002</literal></entry>
765-
<entry>INTEGRITY CONSTRAINT VIOLATION</entry>
799+
<entry>TRANSACTION INTEGRITY CONSTRAINT VIOLATION</entry>
766800
</row>
767801

768802
<row>
@@ -893,7 +927,7 @@
893927

894928
<row>
895929
<entry><literal>42P05</literal></entry>
896-
<entry>DUPLICATE PSTATEMENT</entry>
930+
<entry>DUPLICATE PREPARED STATEMENT</entry>
897931
</row>
898932

899933
<row>
@@ -963,7 +997,7 @@
963997

964998
<row>
965999
<entry><literal>42P14</literal></entry>
966-
<entry>INVALID PSTATEMENT DEFINITION</entry>
1000+
<entry>INVALID PREPARED STATEMENT DEFINITION</entry>
9671001
</row>
9681002

9691003
<row>
@@ -1134,6 +1168,22 @@
11341168
</row>
11351169

11361170

1171+
<row>
1172+
<entry>Class P0</entry>
1173+
<entry><application>PL/pgSQL</> Error</entry>
1174+
</row>
1175+
1176+
<row>
1177+
<entry><literal>P0000</literal></entry>
1178+
<entry>PLPGSQL ERROR</entry>
1179+
</row>
1180+
1181+
<row>
1182+
<entry><literal>P0001</literal></entry>
1183+
<entry>RAISE EXCEPTION</entry>
1184+
</row>
1185+
1186+
11371187
<row>
11381188
<entry>Class XX</entry>
11391189
<entry>Internal Error</entry>

‎doc/src/sgml/plpgsql.sgml‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.42 2004/07/31 07:39:17 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.43 2004/07/31 23:04:54 tgl Exp $
33
-->
44

55
<chapter id="plpgsql">
@@ -1816,12 +1816,11 @@ END LOOP;
18161816
BEGIN
18171817
<replaceable>statements</replaceable>
18181818
EXCEPTION
1819-
WHEN <replaceable>condition</replaceable> THEN
1819+
WHEN <replaceable>condition</replaceable> <optional> OR <replaceable>condition</replaceable> ... </optional> THEN
18201820
<replaceable>handler_statements</replaceable>
1821-
<optional> WHEN <replaceable>condition</replaceable> THEN
1822-
<replaceable>handler_statements</replaceable>
1823-
...
1824-
</optional>
1821+
<optional> WHEN <replaceable>condition</replaceable> <optional> OR <replaceable>condition</replaceable> ... </optional> THEN
1822+
<replaceable>handler_statements</replaceable>
1823+
... </optional>
18251824
END;
18261825
</synopsis>
18271826
</para>
@@ -1841,10 +1840,18 @@ END;
18411840
as though the <literal>EXCEPTION</> clause were not there at all:
18421841
the error can be caught by an enclosing block with
18431842
<literal>EXCEPTION</>, or if there is none it aborts processing
1844-
of the function. The special condition name <literal>OTHERS</>
1843+
of the function.
1844+
</para>
1845+
1846+
<para>
1847+
The <replaceable>condition</replaceable> names can be any of those
1848+
shown in <xref linkend="errcodes-appendix">. A category name matches
1849+
any error within its category.
1850+
The special condition name <literal>OTHERS</>
18451851
matches every error type except <literal>QUERY_CANCELED</>.
1846-
(It is possible, but usually not a good idea, to trap
1852+
(It is possible, but often unwise, to trap
18471853
<literal>QUERY_CANCELED</> by name.)
1854+
Condition names are not case-sensitive.
18481855
</para>
18491856

18501857
<para>
@@ -1879,9 +1886,9 @@ END;
18791886
the <literal>EXCEPTION</> clause. The value returned in the
18801887
<command>RETURN</> statement will be the incremented value of
18811888
<literal>x</>, but the effects of the <command>UPDATE</> command will
1882-
have been rolled back. The <command>INSERT</> command is not rolled
1883-
back, however, so the end result is that the database contains
1884-
<literal>Tom Jones</> not <literal>Joe Jones</>.
1889+
have been rolled back. The <command>INSERT</> command preceding the
1890+
block is not rolled back, however, so the end result is that the database
1891+
contains <literal>Tom Jones</> not <literal>Joe Jones</>.
18851892
</para>
18861893

18871894
<tip>

‎src/include/utils/elog.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.71 2004/07/31 00:45:43 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.72 2004/07/31 23:04:55 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -61,6 +61,10 @@
6161
(PGSIXBIT(ch1) + (PGSIXBIT(ch2) << 6) + (PGSIXBIT(ch3) << 12) + \
6262
(PGSIXBIT(ch4) << 18) + (PGSIXBIT(ch5) << 24))
6363

64+
/* These macros depend on the fact that '0' becomes a zero in SIXBIT */
65+
#define ERRCODE_TO_CATEGORY(ec) ((ec) & ((1 << 12) - 1))
66+
#define ERRCODE_IS_CATEGORY(ec) (((ec) & ~((1 << 12) - 1)) == 0)
67+
6468
/* SQLSTATE codes for errors are defined in a separate file */
6569
#include "utils/errcodes.h"
6670

‎src/pl/plpgsql/src/gram.y‎

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* procedural language
55
*
66
* IDENTIFICATION
7-
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.58 2004/07/31 07:39:20 tgl Exp $
7+
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.59 2004/07/31 23:04:56 tgl Exp $
88
*
99
* This software is copyrighted by Jan Wieck - Hamburg.
1010
*
@@ -96,6 +96,7 @@ static void check_assignable(PLpgSQL_datum *datum);
9696
PLpgSQL_stmt *stmt;
9797
PLpgSQL_stmts *stmts;
9898
PLpgSQL_stmt_block *program;
99+
PLpgSQL_condition *condition;
99100
PLpgSQL_exception *exception;
100101
PLpgSQL_exceptions *exceptions;
101102
PLpgSQL_nsitem *nsitem;
@@ -135,6 +136,7 @@ static void check_assignable(PLpgSQL_datum *datum);
135136

136137
%type <exceptions> exception_sect proc_exceptions
137138
%type <exception> proc_exception
139+
%type <condition> proc_conditions
138140

139141
%type <intlist> raise_params
140142
%type <ival> raise_level raise_param
@@ -181,6 +183,7 @@ static void check_assignable(PLpgSQL_datum *datum);
181183
%token K_NOTICE
182184
%token K_NULL
183185
%token K_OPEN
186+
%token K_OR
184187
%token K_PERFORM
185188
%token K_ROW_COUNT
186189
%token K_RAISE
@@ -1563,21 +1566,52 @@ proc_exceptions : proc_exceptions proc_exception
15631566
}
15641567
;
15651568

1566-
proc_exception : K_WHEN lno opt_lblname K_THEN proc_sect
1569+
proc_exception : K_WHEN lno proc_conditions K_THEN proc_sect
15671570
{
15681571
PLpgSQL_exception *new;
15691572

15701573
new = malloc(sizeof(PLpgSQL_exception));
15711574
memset(new, 0, sizeof(PLpgSQL_exception));
15721575

1573-
new->lineno = $2;
1574-
new->label = $3;
1575-
new->action = $5;
1576+
new->lineno = $2;
1577+
new->conditions = $3;
1578+
new->action = $5;
15761579

15771580
$$ = new;
15781581
}
15791582
;
15801583

1584+
proc_conditions : proc_conditions K_OR opt_lblname
1585+
{
1586+
PLpgSQL_condition *new;
1587+
PLpgSQL_condition *old;
1588+
1589+
new = malloc(sizeof(PLpgSQL_condition));
1590+
memset(new, 0, sizeof(PLpgSQL_condition));
1591+
1592+
new->condname = $3;
1593+
new->next = NULL;
1594+
1595+
for (old = $1; old->next != NULL; old = old->next)
1596+
/* skip */ ;
1597+
old->next = new;
1598+
1599+
$$ = $1;
1600+
}
1601+
| opt_lblname
1602+
{
1603+
PLpgSQL_condition *new;
1604+
1605+
new = malloc(sizeof(PLpgSQL_condition));
1606+
memset(new, 0, sizeof(PLpgSQL_condition));
1607+
1608+
new->condname = $1;
1609+
new->next = NULL;
1610+
1611+
$$ = new;
1612+
}
1613+
;
1614+
15811615
expr_until_semi :
15821616
{ $$ = plpgsql_read_expression(';', ";"); }
15831617
;

0 commit comments

Comments
 (0)