Skip to content

Commit 82433e9

Browse files
committed
Update a couple of example error messages to reflect the fact that we
don't generate constraint names like "$1" anymore.
1 parent c71e3de commit 82433e9

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
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-
$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.42 2004/08/01 17:32:11 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.43 2004/08/07 19:53:48 tgl Exp $
33
-->
44

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

125125
<screen>
126-
ERROR: insert or update on table "weather" violates foreign key constraint "$1"
126+
ERROR: insert or update on table "weather" violates foreign key constraint "weather_city_fkey"
127127
DETAIL: Key (city)=(Berkeley) is not present in table "cities".
128128
</screen>
129129
</para>
@@ -290,6 +290,7 @@ COMMIT;
290290
Remembering the bank database, suppose we debit $100.00 from Alice's
291291
account, and credit Bob's account, only to find later that we should
292292
have credited Wally's account. We could do it using savepoints like
293+
this:
293294

294295
<programlisting>
295296
BEGIN;

doc/src/sgml/ddl.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.27 2004/08/03 20:32:30 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.28 2004/08/07 19:53:48 tgl Exp $ -->
22

33
<chapter id="ddl">
44
<title>Data Definition</title>
@@ -1971,7 +1971,7 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
19711971
<screen>
19721972
DROP TABLE products;
19731973

1974-
NOTICE: constraint $1 on table orders depends on table products
1974+
NOTICE: constraint orders_product_no_fkey on table orders depends on table products
19751975
ERROR: cannot drop table products because other objects depend on it
19761976
HINT: Use DROP ... CASCADE to drop the dependent objects too.
19771977
</screen>

0 commit comments

Comments
 (0)