diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/psqlHelp.h | 6 | ||||
| -rw-r--r-- | src/man/select.l | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/bin/psql/psqlHelp.h b/src/bin/psql/psqlHelp.h index 507b0d54b4d..a14154345a8 100644 --- a/src/bin/psql/psqlHelp.h +++ b/src/bin/psql/psqlHelp.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psqlHelp.h,v 1.67 1999/06/03 19:17:59 momjian Exp $ + * $Id: psqlHelp.h,v 1.68 1999/06/03 19:52:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -317,8 +317,10 @@ TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"}, \t[WHERE qual]\n\ \t[GROUP BY group_list]\n\ \t[HAVING having_clause]\n\ +\t[ { UNION [ALL] | INTERSECT | EXCEPT } SELECT ...]\n\ \t[ORDER BY attr1 [ASC|DESC] [USING op1], ...attrN ]\n\ -\t[ { UNION [ALL] | INTERSECT | EXCEPT } SELECT ...];"}, +\t[FOR UPDATE [OF class_name...]]\n\ +\t[LIMIT count [OFFSET|, count]];"}, {"set", "set run-time environment", "\ diff --git a/src/man/select.l b/src/man/select.l index 9de52c47498..10b11c906ea 100644 --- a/src/man/select.l +++ b/src/man/select.l @@ -1,6 +1,6 @@ .\" This is -*-nroff-*- .\" XXX standard disclaimer belongs here.... -.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.12 1999/03/19 02:41:41 momjian Exp $ +.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.13 1999/06/03 19:52:09 momjian Exp $ .TH SELECT SQL 11/05/95 PostgreSQL PostgreSQL .SH NAME select - retrieve instances from a class @@ -14,8 +14,10 @@ select - retrieve instances from a class [\fBwhere\fR where-clause] [\fBgroup by\fR attr_name1 {, attr_name-i....}] [\fBhaving\fR having-clause] - [\fBorder by\fR attr_name1 [\fBasc\fR | \fBdesc\fR] [\fBusing op1\fR] {, attr_namei...}] [ { \fBunion {all}\fR | \fBintersect\fR | \fBexcept\fR } \fBselect\fR ...] + [\fBorder by\fR attr_name1 [\fBasc\fR | \fBdesc\fR] [\fBusing op1\fR] {, attr_namei...}] + [\fBfor update\fR [\fBof\fR class_name...]] + [\fBlimit\fR count [\fBoffset\fR|, count]] .fi .SH DESCRIPTION @@ -37,6 +39,12 @@ clause allows a user to specify that he wishes the instances sorted according to the corresponding operator. This operator must be a binary one returning a boolean. Multiple sort fields are allowed and are applied from left to right. +The +.BR "for update" +allows the select statement to perform exclusive locking of selected rows. +The +.BR "limit/offset" +allows control over which rows are returned by the query. .PP The target list specifies the fields to be retrieved. Each .IR attr_name |