Skip to content

Commit 6e59122

Browse files
tglsfdctglsfdc
committed
Update obsolete examples of error messages; various other minor editing.
1 parent 8b43e32 commit 6e59122

20 files changed

+181
-144
lines changed

‎doc/src/sgml/advanced.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.35 2003/08/31 17:32:18 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.36 2003/09/12 22:17:18 tgl Exp $
33
-->
44

55
<chapter id="tutorial-advanced">
@@ -123,7 +123,8 @@ INSERT INTO weather VALUES ('Berkeley', 45, 53, 0.0, '1994-11-28');
123123
</programlisting>
124124

125125
<screen>
126-
ERROR: &lt;unnamed&gt; referential integrity violation - key referenced from weather not found in cities
126+
ERROR: insert or update on "weather" violates foreign key constraint "$1"
127+
DETAIL: Key (city)=(Berkeley) is not present in "cities".
127128
</screen>
128129
</para>
129130

‎doc/src/sgml/catalogs.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Documentation of the system catalogs, directed toward PostgreSQL developers
3-
$Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.73 2003/06/25 01:14:37 momjian Exp $
3+
$Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.74 2003/09/12 22:17:19 tgl Exp $
44
-->
55

66
<chapter id="catalogs">
@@ -622,7 +622,7 @@
622622
<row>
623623
<entry><structfield>adnum</structfield></entry>
624624
<entry><type>int2</type></entry>
625-
<entry><literal>pg_attribute.attnum</literal></entry>
625+
<entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</literal></entry>
626626
<entry>The number of the column</entry>
627627
</row>
628628

@@ -1650,7 +1650,7 @@
16501650
<row>
16511651
<entry><structfield>refclassid</structfield></entry>
16521652
<entry><type>oid</type></entry>
1653-
<entry><literal>pg_class.oid</literal></entry>
1653+
<entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
16541654
<entry>The OID of the system catalog the referenced object is in</entry>
16551655
</row>
16561656

@@ -3579,7 +3579,7 @@
35793579
<row>
35803580
<entry><structfield>typbasetype</structfield></entry>
35813581
<entry><type>oid</type></entry>
3582-
<entry><literal>pg_type.oid</literal></entry>
3582+
<entry><literal><link linkend="catalog-pg-type"><structname>pg_type</structname></link>.oid</literal></entry>
35833583
<entry><para>
35843584
If this is a derived type (see <structfield>typtype</structfield>),
35853585
then <structfield>typbasetype</structfield> identifies

‎doc/src/sgml/client-auth.sgml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.57 2003/09/05 20:31:35 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.58 2003/09/12 22:17:22 tgl Exp $
33
-->
44

55
<chapter id="client-authentication">
@@ -130,7 +130,7 @@ hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable>
130130
</para>
131131

132132
<para>
133-
To be able make use of this option the server must be built
133+
To make use of this option the server must be built
134134
with SSL support enabled. Furthermore, SSL must be enabled by
135135
enabling the <varname>ssl</varname> configuration parameter
136136
(see <xref linkend="runtime-config"> for more information).
@@ -901,7 +901,7 @@ omicron bryanh guest1
901901

902902
<para>
903903
<ProgramListing>
904-
No pg_hba.conf entry for host 123.123.123.123, user andym, database testdb
904+
FATAL: no pg_hba.conf entry for host "123.123.123.123", user "andym", database "testdb"
905905
</ProgramListing>
906906
This is what you are most likely to get if you succeed in contacting
907907
the server, but it does not want to talk to you. As the message
@@ -912,7 +912,7 @@ No pg_hba.conf entry for host 123.123.123.123, user andym, database testdb
912912

913913
<para>
914914
<ProgramListing>
915-
Password authentication failed for user 'andym'
915+
FATAL: Password authentication failed for user "andym"
916916
</ProgramListing>
917917
Messages like this indicate that you contacted the server, and it is
918918
willing to talk to you, but not until you pass the authorization
@@ -924,25 +924,27 @@ Password authentication failed for user 'andym'
924924

925925
<para>
926926
<ProgramListing>
927-
FATAL 1: user "andym" does not exist
927+
FATAL: user "andym" does not exist
928928
</ProgramListing>
929929
The indicated user name was not found.
930930
</para>
931931

932932
<para>
933933
<ProgramListing>
934-
FATAL 1: Database "testdb" does not exist in the system catalog.
934+
FATAL: database "testdb" does not exist
935935
</ProgramListing>
936936
The database you are trying to connect to does not exist. Note that
937937
if you do not specify a database name, it defaults to the database
938938
user name, which may or may not be the right thing.
939939
</para>
940940

941+
<tip>
941942
<para>
942-
Note that the server log may contain more information about an
943+
The server log may contain more information about an
943944
authentication failure than is reported to the client. If you are
944945
confused about the reason for a failure, check the log.
945946
</para>
947+
</tip>
946948
</sect1>
947949

948950
</chapter>

‎doc/src/sgml/datatype.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.123 2003/08/31 17:32:18 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.124 2003/09/12 22:17:22 tgl Exp $
33
-->
44

55
<chapter id="datatype">
@@ -2821,7 +2821,7 @@ CREATE TABLE test (a BIT(3), b BIT VARYING(5));
28212821
INSERT INTO test VALUES (B'101', B'00');
28222822
INSERT INTO test VALUES (B'10', B'101');
28232823
<computeroutput>
2824-
ERROR: Bit string length 2 does not match type BIT(3)
2824+
ERROR: bit string length 2 does not match type bit(3)
28252825
</computeroutput>
28262826
INSERT INTO test VALUES (B'10'::bit(3), B'101');
28272827
SELECT * FROM test;

‎doc/src/sgml/ddl.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.18 2003/08/31 17:32:18 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.19 2003/09/12 22:17:22 tgl Exp $ -->
22

33
<chapter id="ddl">
44
<title>Data Definition</title>
@@ -1939,8 +1939,8 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
19391939
DROP TABLE products;
19401940

19411941
NOTICE: constraint $1 on table orders depends on table products
1942-
ERROR: Cannot drop table products because other objects depend on it
1943-
Use DROP ... CASCADE to drop the dependent objects too
1942+
ERROR: cannot drop table products because other objects depend on it
1943+
HINT: Use DROP ... CASCADE to drop the dependent objects too.
19441944
</screen>
19451945
The error message contains a useful hint: if you do not want to
19461946
bother deleting all the dependent objects individually, you can run
@@ -1958,7 +1958,7 @@ DROP TABLE products CASCADE;
19581958
specifying <literal>CASCADE</literal>. Of course, the nature of
19591959
the possible dependencies varies with the type of the object. You
19601960
can also write <literal>RESTRICT</literal> instead of
1961-
<literal>CASCADE</literal> to get the default behavior which is to
1961+
<literal>CASCADE</literal> to get the default behavior, which is to
19621962
prevent drops of objects that other objects depend on.
19631963
</para>
19641964

‎doc/src/sgml/docguide.sgml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.45 2003/09/11 21:42:19 momjian Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.46 2003/09/12 22:17:22 tgl Exp $ -->
22

33
<appendix id="docguide">
44
<title>Documentation</title>
@@ -30,8 +30,8 @@
3030
</listitem>
3131
</itemizedlist>
3232

33-
Additionally, a number of plain-text README-type files can be found
34-
throughout the <productname>PostgreSQL</productname> source tree,
33+
Additionally, a number of plain-text <filename>README</filename> files can
34+
be found throughout the <productname>PostgreSQL</productname> source tree,
3535
documenting various implementation issues.
3636
</para>
3737

@@ -1244,10 +1244,12 @@ End:
12441244
<para>
12451245
Reference pages describing SQL commands should contain the
12461246
following sections: Name, Synopsis, Description, Parameters,
1247-
Usage, Diagnostics, Notes, Examples, Compatibility, History, See
1247+
Outputs, Notes, Examples, Compatibility, History, See
12481248
Also. The Parameters section is like the Options section, but
12491249
there is more freedom about which clauses of the command can be
1250-
listed. The Compatibility section should explain to what extent
1250+
listed. The Outputs section is only needed if the command returns
1251+
something other than a default command-completion tag. The Compatibility
1252+
section should explain to what extent
12511253
this command conforms to the SQL standard(s), or to which other
12521254
database system it is compatible. The See Also section of SQL
12531255
commands should list SQL commands before cross-references to

‎doc/src/sgml/func.sgml

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.172 2003/09/11 18:30:38 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.173 2003/09/12 22:17:22 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -3890,8 +3890,8 @@ substring('foobar' from 'o(.)b') <lineannotation>o</lineannotation>
38903890
</table>
38913891

38923892
<para>
3893-
Warning. <literal><function>to_char</function>(<type>interval</type>, <type>text</type>)</literal>
3894-
is deprecated and should not be used in newly-written code. Will be removed in the next version.
3893+
Warning: <literal><function>to_char</function>(<type>interval</type>, <type>text</type>)</literal>
3894+
is deprecated and should not be used in newly-written code. It will be removed in the next version.
38953895
</para>
38963896

38973897
<para>
@@ -6402,7 +6402,16 @@ SELECT a,
64026402
2 | two
64036403
3 | other
64046404
</screen>
6405-
</para>
6405+
</para>
6406+
6407+
<para>
6408+
A <token>CASE</token> expression does not evaluate any subexpressions
6409+
that are not needed to determine the result. For example, this is a
6410+
possible way of avoiding a division-by-zero failure:
6411+
<programlisting>
6412+
SELECT ... WHERE CASE WHEN x &lt;&gt; 0 THEN y/x &gt; 1.5 ELSE false END;
6413+
</programlisting>
6414+
</para>
64066415
</sect2>
64076416

64086417
<sect2>
@@ -6418,13 +6427,21 @@ SELECT a,
64186427

64196428
<para>
64206429
The <function>COALESCE</function> function returns the first of its
6421-
arguments that is not null. This is often useful to substitute a
6430+
arguments that is not null. Null is returned only if all arguments
6431+
are null. This is often useful to substitute a
64226432
default value for null values when data is retrieved for display,
64236433
for example:
64246434
<programlisting>
64256435
SELECT COALESCE(description, short_description, '(none)') ...
64266436
</programlisting>
64276437
</para>
6438+
6439+
<para>
6440+
Like a <token>CASE</token> expression, <function>COALESCE</function> will
6441+
not evaluate arguments that are not needed to determine the result;
6442+
that is, arguments to the right of the first non-null argument are
6443+
not evaluated.
6444+
</para>
64286445
</sect2>
64296446

64306447
<sect2>
@@ -7277,6 +7294,21 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
72777294
<tbody>
72787295
<row>
72797296
<entry>
7297+
<literal>
7298+
<function>array_cat</function>
7299+
(<type>anyarray</type>, <type>anyarray</type>)
7300+
</literal>
7301+
</entry>
7302+
<entry><type>anyarray</type></entry>
7303+
<entry>
7304+
concatenate two arrays, returning <literal>NULL</literal>
7305+
for <literal>NULL</literal> inputs
7306+
</entry>
7307+
<entry><literal>array_cat(ARRAY[1,2,3], ARRAY[4,5])</literal></entry>
7308+
<entry><literal>{1,2,3,4,5}</literal></entry>
7309+
</row>
7310+
<row>
7311+
<entry>
72807312
<literal>
72817313
<function>array_append</function>
72827314
(<type>anyarray</type>, <type>anyelement</type>)
@@ -7293,17 +7325,17 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
72937325
<row>
72947326
<entry>
72957327
<literal>
7296-
<function>array_cat</function>
7297-
(<type>anyarray</type>, <type>anyarray</type>)
7328+
<function>array_prepend</function>
7329+
(<type>anyelement</type>, <type>anyarray</type>)
72987330
</literal>
72997331
</entry>
73007332
<entry><type>anyarray</type></entry>
73017333
<entry>
7302-
concatenate two arrays, returning <literal>NULL</literal>
7303-
for <literal>NULL</literal> inputs
7334+
append an element to the beginning of an array, returning
7335+
<literal>NULL</literal> for <literal>NULL</literal> inputs
73047336
</entry>
7305-
<entry><literal>array_cat(ARRAY[1,2,3], ARRAY[4,5,6])</literal></entry>
7306-
<entry><literal>{1,2,3,4,5,6}</literal></entry>
7337+
<entry><literal>array_prepend(1, ARRAY[2,3])</literal></entry>
7338+
<entry><literal>{1,2,3}</literal></entry>
73077339
</row>
73087340
<row>
73097341
<entry>
@@ -7317,7 +7349,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
73177349
returns a text representation of array dimension lower and upper bounds,
73187350
generating an ERROR for <literal>NULL</literal> inputs
73197351
</entry>
7320-
<entry><literal>array_dims(array[[1,2,3],[4,5,6]])</literal></entry>
7352+
<entry><literal>array_dims(array[[1,2,3], [4,5,6]])</literal></entry>
73217353
<entry><literal>[1:2][1:3]</literal></entry>
73227354
</row>
73237355
<row>
@@ -7338,17 +7370,17 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
73387370
<row>
73397371
<entry>
73407372
<literal>
7341-
<function>array_prepend</function>
7342-
(<type>anyelement</type>, <type>anyarray</type>)
7373+
<function>array_upper</function>
7374+
(<type>anyarray</type>, <type>integer</type>)
73437375
</literal>
73447376
</entry>
7345-
<entry><type>anyarray</type></entry>
7377+
<entry><type>integer</type></entry>
73467378
<entry>
7347-
append an element to the beginning of an array, returning
7379+
returns upper bound of the requested array dimension, returning
73487380
<literal>NULL</literal> for <literal>NULL</literal> inputs
73497381
</entry>
7350-
<entry><literal>array_prepend(1, ARRAY[2,3])</literal></entry>
7351-
<entry><literal>{1,2,3}</literal></entry>
7382+
<entry><literal>array_upper(ARRAY[1,2,3,4], 1)</literal></entry>
7383+
<entry><literal>4</literal></entry>
73527384
</row>
73537385
<row>
73547386
<entry>
@@ -7362,23 +7394,8 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
73627394
concatenates array elements using provided delimiter, returning
73637395
<literal>NULL</literal> for <literal>NULL</literal> inputs
73647396
</entry>
7365-
<entry><literal>array_to_string(array[1.1,2.2,3.3]::numeric(4,2)[],'~^~')</literal></entry>
7366-
<entry><literal>1.10~^~2.20~^~3.30</literal></entry>
7367-
</row>
7368-
<row>
7369-
<entry>
7370-
<literal>
7371-
<function>array_upper</function>
7372-
(<type>anyarray</type>, <type>integer</type>)
7373-
</literal>
7374-
</entry>
7375-
<entry><type>integer</type></entry>
7376-
<entry>
7377-
returns upper bound of the requested array dimension, returning
7378-
<literal>NULL</literal> for <literal>NULL</literal> inputs
7379-
</entry>
7380-
<entry><literal>array_upper(array_append(ARRAY[1,2,3], 4), 1)</literal></entry>
7381-
<entry><literal>4</literal></entry>
7397+
<entry><literal>array_to_string(array[1, 2, 3], '~^~')</literal></entry>
7398+
<entry><literal>1~^~2~^~3</literal></entry>
73827399
</row>
73837400
<row>
73847401
<entry>
@@ -7392,8 +7409,8 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
73927409
splits string into array elements using provided delimiter, returning
73937410
<literal>NULL</literal> for <literal>NULL</literal> inputs
73947411
</entry>
7395-
<entry><literal>string_to_array('1.10~^~2.20~^~3.30','~^~')::float8[]</literal></entry>
7396-
<entry><literal>{1.1,2.2,3.3}</literal></entry>
7412+
<entry><literal>string_to_array( 'xx~^~yy~^~zz', '~^~')</literal></entry>
7413+
<entry><literal>{xx,yy,zz}</literal></entry>
73977414
</row>
73987415
</tbody>
73997416
</tgroup>

‎doc/src/sgml/info.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.19 2003/09/08 23:02:28 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.20 2003/09/12 22:17:23 tgl Exp $
33
-->
44

55
<sect1 id="resources">
@@ -24,7 +24,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.19 2003/09/08 23:02:28 petere
2424
<term>READMEs</term>
2525
<listitem>
2626
<para>
27-
<filename>README</filename> files are available for some
27+
<filename>README</filename> files are available for most
2828
contributed packages.
2929
</para>
3030
</listitem>

0 commit comments

Comments
 (0)