Commit d8d0aa01 authored by Bruce Momjian's avatar Bruce Momjian

Update psql help syntax to remove <> and uppercaese keywords.

parent 8e2647a1
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.16 1998/07/24 03:31:23 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.17 1998/07/25 00:17:28 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -175,6 +175,7 @@ Oid param_type(int t); /* used in parse_expr.c */ ...@@ -175,6 +175,7 @@ Oid param_type(int t); /* used in parse_expr.c */
join_using join_using
%type <boolean> opt_union %type <boolean> opt_union
%type <boolean> opt_table %type <boolean> opt_table
%type <boolean> opt_trans
%type <node> position_expr %type <node> position_expr
%type <list> extract_list, position_list %type <list> extract_list, position_list
...@@ -1994,74 +1995,41 @@ ListenStmt: LISTEN relation_name ...@@ -1994,74 +1995,41 @@ ListenStmt: LISTEN relation_name
* *
*****************************************************************************/ *****************************************************************************/
TransactionStmt: ABORT_TRANS TRANSACTION TransactionStmt: ABORT_TRANS opt_trans
{ {
TransactionStmt *n = makeNode(TransactionStmt); TransactionStmt *n = makeNode(TransactionStmt);
n->command = ABORT_TRANS; n->command = ABORT_TRANS;
$$ = (Node *)n; $$ = (Node *)n;
} }
| BEGIN_TRANS TRANSACTION | BEGIN_TRANS opt_trans
{ {
TransactionStmt *n = makeNode(TransactionStmt); TransactionStmt *n = makeNode(TransactionStmt);
n->command = BEGIN_TRANS; n->command = BEGIN_TRANS;
$$ = (Node *)n; $$ = (Node *)n;
} }
| BEGIN_TRANS WORK | COMMIT opt_trans
{
TransactionStmt *n = makeNode(TransactionStmt);
n->command = BEGIN_TRANS;
$$ = (Node *)n;
}
| COMMIT WORK
{ {
TransactionStmt *n = makeNode(TransactionStmt); TransactionStmt *n = makeNode(TransactionStmt);
n->command = END_TRANS; n->command = END_TRANS;
$$ = (Node *)n; $$ = (Node *)n;
} }
| END_TRANS TRANSACTION | END_TRANS opt_trans
{ {
TransactionStmt *n = makeNode(TransactionStmt); TransactionStmt *n = makeNode(TransactionStmt);
n->command = END_TRANS; n->command = END_TRANS;
$$ = (Node *)n; $$ = (Node *)n;
} }
| ROLLBACK WORK | ROLLBACK opt_trans
{
TransactionStmt *n = makeNode(TransactionStmt);
n->command = ABORT_TRANS;
$$ = (Node *)n;
}
| ABORT_TRANS
{ {
TransactionStmt *n = makeNode(TransactionStmt); TransactionStmt *n = makeNode(TransactionStmt);
n->command = ABORT_TRANS; n->command = ABORT_TRANS;
$$ = (Node *)n; $$ = (Node *)n;
} }
| BEGIN_TRANS ;
{
TransactionStmt *n = makeNode(TransactionStmt);
n->command = BEGIN_TRANS;
$$ = (Node *)n;
}
| COMMIT
{
TransactionStmt *n = makeNode(TransactionStmt);
n->command = END_TRANS;
$$ = (Node *)n;
}
| END_TRANS opt_trans: WORK { $$ = NULL; }
{ | TRANSACTION { $$ = NULL: }
TransactionStmt *n = makeNode(TransactionStmt); | /*EMPTY*/ { $$ = NULL; }
n->command = END_TRANS;
$$ = (Node *)n;
}
| ROLLBACK
{
TransactionStmt *n = makeNode(TransactionStmt);
n->command = ABORT_TRANS;
$$ = (Node *)n;
}
; ;
......
This diff is collapsed.
.\" This is -*-nroff-*- .\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here.... .\" XXX standard disclaimer belongs here....
.\" $Header: /cvsroot/pgsql/src/man/Attic/create_operator.l,v 1.6 1998/06/24 13:21:24 momjian Exp $ .\" $Header: /cvsroot/pgsql/src/man/Attic/create_operator.l,v 1.7 1998/07/25 00:17:30 momjian Exp $
.TH "CREATE OPERATOR" SQL 11/05/95 PostgreSQL PostgreSQL .TH "CREATE OPERATOR" SQL 11/05/95 PostgreSQL PostgreSQL
.SH NAME .SH NAME
create operator - define a new user operator create operator - define a new user operator
...@@ -30,7 +30,7 @@ The user who defines an operator becomes its owner. ...@@ -30,7 +30,7 @@ The user who defines an operator becomes its owner.
.PP .PP
The The
.IR "operator_name" .IR "operator_name"
is a sequence of up to sixteen punctuation characters. The following is a sequence of punctuation characters. The following
characters are valid for single-character operator names: characters are valid for single-character operator names:
.nf .nf
......
.\" This is -*-nroff-*- .\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here.... .\" XXX standard disclaimer belongs here....
.\" $Header: /cvsroot/pgsql/src/man/Attic/load.l,v 1.3 1998/01/11 22:17:43 momjian Exp $ .\" $Header: /cvsroot/pgsql/src/man/Attic/load.l,v 1.4 1998/07/25 00:17:30 momjian Exp $
.TH LOAD SQL 01/23/93 PostgreSQL PostgreSQL .TH LOAD SQL 01/23/93 PostgreSQL PostgreSQL
.SH NAME .SH NAME
load - dynamically load an object file load - dynamically load an object file
.SH SYNOPSIS .SH SYNOPSIS
.nf .nf
\fBload\fR "filename" \fBload\fR 'filename'
.fi .fi
.SH DESCRIPTION .SH DESCRIPTION
.BR Load .BR Load
...@@ -27,7 +27,7 @@ at this time. ...@@ -27,7 +27,7 @@ at this time.
-- --
--Load the file /usr/postgres/demo/circle.o --Load the file /usr/postgres/demo/circle.o
-- --
load "/usr/postgres/demo/circle.o" load '/usr/postgres/demo/circle.o'
.fi .fi
.SH CAVEATS .SH CAVEATS
Functions in loaded object files should not call functions in other Functions in loaded object files should not call functions in other
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment