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

Commit0d01fd4

Browse files
committed
Add EXCEPT/INTERSECT doc changes.
1 parent58cc2b6 commit0d01fd4

File tree

4 files changed

+93
-20
lines changed

4 files changed

+93
-20
lines changed

‎doc/src/sgml/ref/select.sgml‎

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SELECT [ALL|DISTINCT [ON <replaceable class="PARAMETER">column</replaceable>] ]
2424
[ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
2525
[ GROUP BY <replaceable class="PARAMETER">column</replaceable> [, ...] ]
2626
[ HAVING <replaceable class="PARAMETER">condition</replaceable> [, ...] ]
27-
[ UNION [ALL] <replaceable class="PARAMETER">select</replaceable> ]
27+
[{UNION [ALL] | INTERSECT | EXCEPT } <replaceable class="PARAMETER">select</replaceable> ]
2828
[ ORDER BY <replaceable class="PARAMETER">column</replaceable> [ ASC | DESC ] [, ...] ]
2929
</synopsis>
3030

@@ -230,8 +230,16 @@ including duplicates.
230230
DESCending mode operator. (See ORDER BY clause)</para>
231231

232232
<para>
233-
The UNION clause specifies a table derived from a Cartesian
234-
product union join. (See UNION clause).</para>
233+
The UNION clause allows the result to be the collection of rows
234+
returned by the queries involved. (See UNION clause).</para>
235+
236+
<para>
237+
The INTERSECT give you the rows that are common to both queries.
238+
(See INTERSECT clause).</para>
239+
240+
<para>
241+
The EXCEPT give you the rows in the upper query not in the lower query.
242+
(See EXCEPT clause).</para>
235243

236244
<para>
237245
You must have SELECT privilege to a table to read its values
@@ -370,7 +378,8 @@ SELECT name FROM distributors ORDER BY code;
370378
specifies any select expression without an ORDER BY clause.</para>
371379

372380
<para>
373-
The UNION operator specifies a table derived from a Cartesian product.
381+
The UNION clause allows the result to be the collection of rows
382+
returned by the queries involved. (See UNION clause).
374383
The two tables that represent the direct operands of the UNION must
375384
have the same number of columns, and corresponding columns must be
376385
of compatible data types.</para>
@@ -381,11 +390,75 @@ SELECT name FROM distributors ORDER BY code;
381390

382391
<para>
383392
Multiple UNION operators in the same SELECT statement are
384-
evaluated left to right.
393+
evaluated left to right.
385394
Note that the ALL keyword is not global in nature, being
386-
applied only for the current pair of table results.</para>
395+
applied only for the current pair of table results.</para>
396+
397+
</refsect2>
398+
399+
<refsect2 id="R2-SQL-INTERSECT-2">
400+
<refsect2info>
401+
<date>1998-09-24</date>
402+
</refsect2info>
403+
<title>
404+
INTERSECT Clause
405+
</title>
406+
<para>
407+
<synopsis>
408+
<replaceable class="PARAMETER">table_query</replaceable> INTERSECT <replaceable class="PARAMETER">table_query</replaceable>
409+
[ ORDER BY <replaceable class="PARAMETER">column</replaceable> [ ASC | DESC ] [, ...] ]
410+
</synopsis>
411+
412+
where
413+
<replaceable class="PARAMETER">table_query</replaceable>
414+
specifies any select expression without an ORDER BY clause.</para>
415+
416+
<para>
417+
The INTERSECT clause allows the result to be all rows that are
418+
common to the involved queries. (See INTERSECT clause).
419+
The two tables that represent the direct operands of the INTERSECT must
420+
have the same number of columns, and corresponding columns must be
421+
of compatible data types.</para>
422+
423+
<para>
424+
Multiple INTERSECT operators in the same SELECT statement are
425+
evaluated left to right.
426+
</para>
427+
428+
</refsect2>
429+
430+
<refsect2 id="R2-SQL-EXCEPT-2">
431+
<refsect2info>
432+
<date>1998-09-24</date>
433+
</refsect2info>
434+
<title>
435+
EXCEPT Clause
436+
</title>
437+
<para>
438+
<synopsis>
439+
<replaceable class="PARAMETER">table_query</replaceable> EXCEPT <replaceable class="PARAMETER">table_query</replaceable>
440+
[ ORDER BY <replaceable class="PARAMETER">column</replaceable> [ ASC | DESC ] [, ...] ]
441+
</synopsis>
387442

388-
</refsect2></refsect1>
443+
where
444+
<replaceable class="PARAMETER">table_query</replaceable>
445+
specifies any select expression without an ORDER BY clause.</para>
446+
447+
<para>
448+
The EXCEPT clause allows the result to be rows from the upper query
449+
that are not in the lower query. (See EXCEPT clause).
450+
The two tables that represent the direct operands of the EXCEPT must
451+
have the same number of columns, and corresponding columns must be
452+
of compatible data types.</para>
453+
454+
<para>
455+
Multiple EXCEPT operators in the same SELECT statement are
456+
evaluated left to right.
457+
</para>
458+
459+
</refsect2>
460+
461+
</refsect1>
389462

390463
<refsect1 id="R1-SQL-SELECT-2">
391464
<title>
@@ -633,7 +706,7 @@ SELECT [ ALL | DISTINCT ] <replaceable class="PARAMETER">expression</replaceable
633706
[ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
634707
[ GROUP BY <replaceable class="PARAMETER">column</replaceable> [, ...] ]
635708
[ HAVING <replaceable class="PARAMETER">condition</replaceable> [, ...] ]
636-
[ UNION [ALL ] <replaceable class="PARAMETER">select</replaceable>]
709+
[{UNION [ALL] | INTERSECT | EXCEPT } <replaceable class="PARAMETER">select</replaceable>]
637710
[ ORDER BY <replaceable class="PARAMETER">column</replaceable> [ ASC | DESC ] [, ...] ]
638711
</synopsis>
639712

‎doc/src/sgml/sql.sgml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ used to retrieve data. The syntax is:
463463
[WHERE condition]
464464
[GROUP BY <name_of_attr_i>
465465
[,... [, <name_of_attr_j>]] [HAVING condition]]
466-
[{UNION | INTERSECT | EXCEPT} SELECT ...]
466+
[{UNION[ALL]| INTERSECT | EXCEPT} SELECT ...]
467467
[ORDER BY <name_of_attr_i> [ASC|DESC]
468468
[, ... [, <name_of_attr_j> [ASC|DESC]]]];
469469
\end{verbatim}

‎src/bin/psql/psqlHelp.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: psqlHelp.h,v 1.59 1999/02/13 23:20:40 momjian Exp $
8+
* $Id: psqlHelp.h,v 1.60 1999/03/19 02:41:36 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -108,7 +108,7 @@ static struct _helpStruct QL_HELP[] = {
108108
"define a new rule",
109109
"\
110110
\tCREATE RULE rule_name AS ON\n\
111-
\t[SELECT|UPDATE|DELETE|INSERT]\n\
111+
\t{SELECT |UPDATE |DELETE |INSERT }\n\
112112
\tTO object [WHERE qual]\n\
113113
\tDO [INSTEAD] [action|NOTHING|[actions]];"},
114114
{"create sequence",
@@ -175,7 +175,7 @@ static struct _helpStruct QL_HELP[] = {
175175
\t[GROUP BY group_list]\n\
176176
\t[HAVING having_clause]\n\
177177
\t[ORDER BY attr1 [USING op1], ...attrN]\n\
178-
\t[UNION [ALL] SELECT ...];"},
178+
\t[ {UNION [ALL] | INTERSECT | EXCEPT } SELECT ...];"},
179179
{"delete",
180180
"delete tuples",
181181
"\
@@ -258,8 +258,8 @@ static struct _helpStruct QL_HELP[] = {
258258
"grant access control to a user or group",
259259
"\
260260
\tGRANT privilege1, ...privilegeN ON rel1, ...relN TO \n\
261-
[PUBLIC|GROUP group|username]\n\
262-
\t privilege is ALL|SELECT|INSERT|UPDATE|DELETE|RULE"},
261+
{PUBLIC |GROUP group |username }\n\
262+
\t privilege is{ALL |SELECT |INSERT |UPDATE |DELETE |RULE }"},
263263
{"insert",
264264
"insert tuples",
265265
"\
@@ -271,7 +271,7 @@ static struct _helpStruct QL_HELP[] = {
271271
\t[WHERE qual]\n\
272272
\t[GROUP BY group_list]\n\
273273
\t[HAVING having_clause]\n\
274-
\t[UNION [ALL] SELECT ...];"},
274+
\t[ {UNION [ALL] | INTERSECT | EXCEPT } SELECT ...];"},
275275
{"listen",
276276
"listen for notification on a condition name",
277277
"\
@@ -305,8 +305,8 @@ static struct _helpStruct QL_HELP[] = {
305305
"revoke access control from a user or group",
306306
"\
307307
\tREVOKE privilege1, ...privilegeN ON rel1, ...relN FROM \n\
308-
[PUBLIC|GROUP group|username]\n\
309-
\t privilege is ALL|SELECT|INSERT|UPDATE|DELETE|RULE"},
308+
{PUBLIC |GROUP group |username }\n\
309+
\t privilege is{ALL |SELECT |INSERT |UPDATE |DELETE |RULE }"},
310310
{"rollback work",
311311
"abort a transaction",
312312
"\
@@ -321,7 +321,7 @@ static struct _helpStruct QL_HELP[] = {
321321
\t[GROUP BY group_list]\n\
322322
\t[HAVING having_clause]\n\
323323
\t[ORDER BY attr1 [ASC|DESC] [USING op1], ...attrN ]\n\
324-
\t[UNION [ALL] SELECT ...];"},
324+
\t[ {UNION [ALL] | INTERSECT | EXCEPT } SELECT ...];"},
325325
{"set",
326326
"set run-time environment",
327327
#ifdefMULTIBYTE

‎src/man/select.l‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" This is -*-nroff-*-
22
.\" XXX standard disclaimer belongs here....
3-
.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.11 1999/02/02 03:45:32 momjian Exp $
3+
.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.12 1999/03/19 02:41:41 momjian Exp $
44
.TH SELECT SQL 11/05/95 PostgreSQL PostgreSQL
55
.SH NAME
66
select - retrieve instances from a class
@@ -15,7 +15,7 @@ select - retrieve instances from a class
1515
[\fBgroupby\fR attr_name1 {, attr_name-i....}]
1616
[\fBhaving\fR having-clause]
1717
[\fBorderby\fR attr_name1 [\fBasc\fR |\fBdesc\fR] [\fBusingop1\fR] {, attr_namei...}]
18-
[\fBunion{all}select\fR ...]
18+
[ {\fBunion{all}\fR |\fBintersect\fR |\fBexcept\fR }\fBselect\fR ...]
1919

2020
.fi
2121
.SH DESCRIPTION

0 commit comments

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