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

Commit4579e68

Browse files
committed
Updated user's guide to match new psql's output format
Fixed bug in createdb/alternative location
1 parent3871b69 commit4579e68

23 files changed

+387
-404
lines changed

‎doc/src/sgml/array.sgml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,12 @@ INSERT INTO SAL_EMP
5656
whose pay changed in the second quarter:
5757

5858
<ProgramListing>
59-
SELECT name
60-
FROM SAL_EMP
61-
WHERE SAL_EMP.pay_by_quarter[1] &lt;&gt;
62-
SAL_EMP.pay_by_quarter[2];
59+
SELECT name FROM sal_emp WHERE pay_by_quarter[1] &lt;&gt; pay_by_quarter[2];
6360

64-
+------+
65-
|name |
66-
+------+
67-
|Carol |
68-
+------+
61+
name
62+
-------
63+
Carol
64+
(1 row)
6965
</ProgramListing>
7066
</Para>
7167

@@ -74,16 +70,13 @@ SELECT name
7470
employees:
7571

7672
<ProgramListing>
77-
SELECTSAL_EMP.pay_by_quarter[3] FROMSAL_EMP;
73+
SELECT pay_by_quarter[3] FROMsal_emp;
7874

79-
80-
+---------------+
81-
|pay_by_quarter |
82-
+---------------+
83-
|10000 |
84-
+---------------+
85-
|25000 |
86-
+---------------+
75+
pay_by_quarter
76+
----------------
77+
10000
78+
25000
79+
(2 rows)
8780
</ProgramListing>
8881
</Para>
8982

@@ -93,15 +86,12 @@ SELECT SAL_EMP.pay_by_quarter[3] FROM SAL_EMP;
9386
Bill's schedule for the first two days of the week.
9487

9588
<ProgramListing>
96-
SELECT SAL_EMP.schedule[1:2][1:1]
97-
FROM SAL_EMP
98-
WHERE SAL_EMP.name = 'Bill';
89+
SELECT schedule[1:2][1:1] FROM sal_emp WHERE name = 'Bill';
9990

100-
+-------------------+
101-
|schedule |
102-
+-------------------+
103-
|{{"meeting"},{""}} |
104-
+-------------------+
91+
schedule
92+
--------------------
93+
{{"meeting"},{""}}
94+
(1 row)
10595
</ProgramListing>
10696
</Para>
10797

‎doc/src/sgml/datatype.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
939939
<entry>ISO-8601</entry>
940940
</row>
941941
<row>
942-
<entry>040506-08/entry>
942+
<entry>040506-08</entry>
943943
<entry>ISO-8601</entry>
944944
</row>
945945
</tbody>

‎doc/src/sgml/inherit.sgml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
state capitals which are also cities. Naturally, the
77
capitals class should inherit from cities.
88

9-
<programlisting>
9+
<programlisting>
1010
CREATE TABLE cities (
1111
name text,
1212
population float,
@@ -16,7 +16,7 @@ CREATE TABLE cities (
1616
CREATE TABLE capitals (
1717
state char(2)
1818
) INHERITS (cities);
19-
</programlisting>
19+
</programlisting>
2020

2121
In this case, an instance of capitals <firstterm>inherits</firstterm> all
2222
attributes (name, population, and altitude) from its
@@ -40,45 +40,39 @@ CREATE TABLE capitals (
4040
For example, the following query finds
4141
all the cities that are situated at an attitude of 500ft or higher:
4242

43-
<programlisting>
43+
<programlisting>
4444
SELECT name, altitude
4545
FROM cities
4646
WHERE altitude &gt; 500;
4747

48-
+----------+----------+
49-
|name | altitude |
50-
+----------+----------+
51-
|Las Vegas | 2174 |
52-
+----------+----------+
53-
|Mariposa | 1953 |
54-
+----------+----------+
55-
</programlisting>
48+
name | altitude
49+
-----------+----------
50+
Las Vegas | 2174
51+
Mariposa | 1953
52+
(2 rows)
53+
</programlisting>
5654
</para>
5755

5856
<para>
5957
On the other hand, to find the names of all cities,
6058
including state capitals, that are located at an altitude
6159
over 500ft, the query is:
6260

63-
<programlisting>
61+
<programlisting>
6462
SELECT c.name, c.altitude
6563
FROM cities* c
6664
WHERE c.altitude > 500;
67-
</programlisting>
65+
</programlisting>
6866

6967
which returns:
7068

71-
<programlisting>
72-
+----------+----------+
73-
|name | altitude |
74-
+----------+----------+
75-
|Las Vegas | 2174 |
76-
+----------+----------+
77-
|Mariposa | 1953 |
78-
+----------+----------+
79-
|Madison | 845 |
80-
+----------+----------+
81-
</programlisting>
69+
<programlisting>
70+
name | altitude
71+
-----------+----------
72+
Las Vegas | 2174
73+
Mariposa | 1953
74+
Madison | 845
75+
</programlisting>
8276

8377
Here the <quote>*</quote> after cities indicates that the query should
8478
be run over cities and all classes below cities in the

‎doc/src/sgml/manage-ag.sgml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,23 @@
6565
to try out the examples in this manual. It can be activated for the
6666
<replaceable class="parameter">dbname</replaceable> database by typing the command:
6767

68-
<programlisting>
69-
%psql <replaceable class="parameter">dbname</replaceable>
70-
</programlisting>
68+
<programlisting>
69+
psql <replaceable class="parameter">dbname</replaceable>
70+
</programlisting>
7171

7272
You will be greeted with the following message:
7373

74-
<programlisting>
75-
Welcome to thePostgres interactivesql monitor:
74+
<programlisting>
75+
Welcome topsql,thePostgreSQL interactiveterminal.
7676

77-
type \? for help on slash commands
78-
type \q to quit
79-
type \g or terminate with semicolon to execute query
80-
You are currently connected to the database: <replaceable>dbname</replaceable>
77+
Type: \copyright for distribution terms
78+
\h for help with SQL commands
79+
\? for help on internal slash commands
80+
\g or terminate with semicolon to execute query
81+
\q to quit
8182

8283
<replaceable>dbname</replaceable>=&gt;
83-
</programlisting>
84+
</programlisting>
8485
</para>
8586

8687
<para>

‎doc/src/sgml/manage.sgml

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,22 @@
4343

4444
<Para>
4545
To create a new database named <Quote>mydb</Quote> from the command line, type
46-
<ProgramListing>
46+
<ProgramListing>
4747
% createdb mydb
48-
</ProgramListing>
48+
</ProgramListing>
4949

5050
and to do the same from within <Application>psql</Application> type
51-
<ProgramListing>
52-
* CREATE DATABASE mydb;
53-
</ProgramListing>
51+
<ProgramListing>
52+
=> CREATE DATABASE mydb;
53+
</ProgramListing>
5454
</Para>
5555

5656
<Para>
5757
If you do not have the privileges required to create a database, you will see
5858
the following:
59-
<ProgramListing>
60-
% createdb mydb
61-
WARN:user "your username" is not allowed to create/destroy databases
62-
createdb: database creation failed on mydb.
63-
</ProgramListing>
59+
<ProgramListing>
60+
ERROR: CREATE DATABASE: Permission denied.
61+
</ProgramListing>
6462
</Para>
6563

6664
<Para>
@@ -123,45 +121,41 @@ createdb: database creation failed on mydb.
123121
ensure that <FileName>/alt/postgres</FileName> already exists and is writable by
124122
the Postgres administrator account.
125123
Then, from the command line, type
126-
<ProgramListing>
127-
% initlocation$PGDATA2
124+
<ProgramListing>
125+
% initlocation PGDATA2
128126
Creating Postgres database system directory /alt/postgres/data
129127
Creating Postgres database system directory /alt/postgres/data/base
130-
</ProgramListing>
128+
</ProgramListing>
131129
</Para>
132130

133131
<Para>
134132
To create a database in the alternate storage area <envar>PGDATA2</envar>
135133
from the command line, use the following command:
136-
<ProgramListing>
134+
<ProgramListing>
137135
% createdb -D PGDATA2 mydb
138-
</ProgramListing>
136+
</ProgramListing>
139137

140138
and to do the same from within <Application>psql</Application> type
141-
<ProgramListing>
142-
* CREATE DATABASE mydb WITH LOCATION = 'PGDATA2';
143-
</ProgramListing>
139+
<ProgramListing>
140+
=> CREATE DATABASE mydb WITH LOCATION = 'PGDATA2';
141+
</ProgramListing>
144142
</Para>
145143

146144
<Para>
147145
If you do not have the privileges required to create a database, you will see
148146
the following:
149-
<ProgramListing>
150-
% createdb mydb
151-
WARN:user "your username" is not allowed to create/destroy databases
152-
createdb: database creation failed on mydb.
153-
</ProgramListing>
147+
<ProgramListing>
148+
ERROR: CREATE DATABASE: permission denied
149+
</ProgramListing>
154150
</Para>
155151

156152
<Para>
157153
If the specified location does not exist or the database backend does not have
158154
permission to access it or to write to directories under it, you will see
159155
the following:
160-
<ProgramListing>
161-
% createdb -D /alt/postgres/data mydb
162-
ERROR: Unable to create database directory /alt/postgres/data/base/mydb
163-
createdb: database creation failed on mydb.
164-
</ProgramListing>
156+
<ProgramListing>
157+
ERROR: The database path '/no/where' is invalid. This may be due to a character that is not allowed or because the chosen path isn't permitted for databases.
158+
</ProgramListing>
165159
</Para>
166160

167161
</Sect1>
@@ -176,9 +170,9 @@ createdb: database creation failed on mydb.
176170
<ItemizedList Mark="bullet" Spacing="compact">
177171
<ListItem>
178172
<Para>
179-
running the <ProductName>Postgres</ProductName>terminal monitor programs (e.g.
180-
<Application>psql</Application>) which allows you to interactively
181-
enter, edit, and execute <Acronym>SQL</Acronym> commands.
173+
running the <ProductName>PostgreSQL</ProductName>interactive terminal
174+
<Application>psql</Application> which allows you to interactively
175+
enter, edit, and execute <Acronym>SQL</Acronym> commands.
182176
</Para>
183177
</ListItem>
184178
<ListItem>
@@ -202,26 +196,26 @@ to try out the examples in this manual.
202196

203197
You will be greeted with the following message:
204198
<ProgramListing>
205-
Welcome to thePOSTGRESQL interactivesql monitor:
206-
Please read the file COPYRIGHT for copyright terms of POSTGRESQL
207-
208-
type \? for helpon slash commands
209-
type \q to quit
210-
type \g or terminate with semicolon to execute query
211-
You are currently connected to the database: template1
199+
Welcome topsql,thePostgreSQL interactiveterminal.
200+
201+
Type: \copyright for distribution terms
202+
\h for helpwith SQL commands
203+
\? for help on internal slash commands
204+
\g or terminate with semicolon to execute query
205+
\q to quit
212206

213207
mydb=>
214208
</ProgramListing>
215209
</Para>
216210

217211
<Para>
218-
This prompt indicates thatthe terminal monitor is listening
212+
This prompt indicates thatpsql is listening
219213
to you and that you can type <Acronym>SQL</Acronym> queries into a
220214
workspace maintained by the terminal monitor.
221215
The <Application>psql</Application> program responds to escape codes that begin
222216
with the backslash character, <Quote>\</Quote> For example, you
223217
can get help on the syntax of various
224-
<ProductName>Postgres</ProductName> <Acronym>SQL</Acronym> commands by typing:
218+
<ProductName>PostgreSQL</ProductName> <Acronym>SQL</Acronym> commands by typing:
225219
<ProgramListing>
226220
mydb=> \h
227221
</ProgramListing>
@@ -249,7 +243,7 @@ mydb=> \q
249243
</ProgramListing>
250244

251245
and <Application>psql</Application> will quit and return you to your command
252-
shell. (For more escape codes, type <Command>\h</Command> at themonitor
246+
shell. (For more escape codes, type <Command>\?</Command> at thepsql
253247
prompt.)
254248
White space (i.e., spaces, tabs and newlines) may be
255249
used freely in <Acronym>SQL</Acronym> queries. Single-line comments are denoted by
@@ -280,14 +274,14 @@ TBD
280274
<Title>Destroying a Database</Title>
281275

282276
<Para>
283-
If you are thedatabase administrator for the database
277+
If you are theowner of the database
284278
<Database>mydb</Database>, you can destroy it using the following Unix command:
285279
<ProgramListing>
286280
% dropdb mydb
287281
</ProgramListing>
288-
This action physically removes all oftheUnix files
282+
This action physically removes all of the Unix files
289283
associated with the database and cannot be undone, so
290-
this should only be done with agreatdeal of forethought.
284+
this should only be done with a great dealof forethought.
291285
</Para>
292286
</Sect1>
293287

‎doc/src/sgml/ref/abort.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/abort.sgml,v 1.5 2000/01/29 16:58:27 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/abort.sgml,v 1.6 2000/03/26 18:32:27 petere Exp $
33
Postgres documentation
44
-->
55

@@ -63,7 +63,6 @@ ROLLBACK
6363
<varlistentry>
6464
<term><computeroutput>
6565
NOTICE: ROLLBACK: no transaction in progress
66-
ROLLBACK
6766
</computeroutput></term>
6867
<listitem>
6968
<para>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp