aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/man/abort.l4
-rw-r--r--src/man/begin.l4
-rw-r--r--src/man/commit.l4
-rw-r--r--src/man/declare.l4
-rw-r--r--src/man/fetch.l20
-rw-r--r--src/man/large_objects.38
-rw-r--r--src/man/libpq.310
-rw-r--r--src/man/lock.l6
-rw-r--r--src/man/move.l18
-rw-r--r--src/man/rollback.l4
10 files changed, 41 insertions, 41 deletions
diff --git a/src/man/abort.l b/src/man/abort.l
index b7a6f09b75f..7f471ddf396 100644
--- a/src/man/abort.l
+++ b/src/man/abort.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/abort.l,v 1.3 1998/01/11 22:17:01 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/abort.l,v 1.4 1998/03/23 15:09:22 momjian Exp $
.TH ABORT SQL 01/23/93 PostgreSQL PostgreSQL
.\" XXX This .XA has to go after the .TH so that the index page number goes
.\" in the right place...
@@ -19,5 +19,5 @@ is functionally equivalent to
.IR "rollback".
.SH "SEE ALSO"
begin(l),
-end(l),
+commit(l),
rollback(l).
diff --git a/src/man/begin.l b/src/man/begin.l
index fc5fd809f0a..04fd5737308 100644
--- a/src/man/begin.l
+++ b/src/man/begin.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/begin.l,v 1.3 1998/01/11 22:17:05 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/begin.l,v 1.4 1998/03/23 15:09:23 momjian Exp $
.TH BEGIN SQL 11/05/95 PostgreSQL PostgreSQL
.SH NAME
begin - begins a transaction
@@ -17,4 +17,4 @@ them are done. Transactions have the standard ACID (atomic,
consistent, isolatable, and durable) property.
.SH "SEE ALSO"
abort(l),
-end(l).
+commit(l).
diff --git a/src/man/commit.l b/src/man/commit.l
index 2e52408ed89..7d4889e8b8c 100644
--- a/src/man/commit.l
+++ b/src/man/commit.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/commit.l,v 1.3 1998/01/11 22:17:10 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/commit.l,v 1.4 1998/03/23 15:09:25 momjian Exp $
.TH COMMIT SQL 01/23/93 PostgreSQL PostgreSQL
.SH NAME
commit - commit the current transaction
@@ -19,5 +19,5 @@ command
.SH "SEE ALSO"
abort(l),
begin(l),
-end(l),
+commit(l),
rollback(l).
diff --git a/src/man/declare.l b/src/man/declare.l
index 37a3e11a253..5841e35a2ac 100644
--- a/src/man/declare.l
+++ b/src/man/declare.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/declare.l,v 1.3 1998/01/22 23:05:18 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/declare.l,v 1.4 1998/03/23 15:09:26 momjian Exp $
.TH FETCH SQL 01/23/93 PostgreSQL PostgreSQL
.SH NAME
declare - declare a cursor
@@ -35,5 +35,5 @@ For an example, see the fetch(l) manual page.
.SH "SEE ALSO"
fetch(l),
begin(l),
-end(l),
+commit(l),
select(l).
diff --git a/src/man/fetch.l b/src/man/fetch.l
index 3d29278570b..906047eb96a 100644
--- a/src/man/fetch.l
+++ b/src/man/fetch.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/fetch.l,v 1.5 1998/01/11 22:17:35 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/fetch.l,v 1.6 1998/03/23 15:09:29 momjian Exp $
.TH FETCH SQL 01/23/93 PostgreSQL PostgreSQL
.SH NAME
fetch - fetch instance(s) from a cursor
@@ -34,33 +34,33 @@ commands to update data.
Cursors may only be used inside of transaction blocks marked by
.IR begin (l)
and
-.IR end (l)
+.IR commit (l)
because the data that they store spans multiple user queries.
.SH EXAMPLE
.nf
--
--set up and use a cursor
--
-begin
- declare mycursor cursor for
- select * from pg-user;
+begin work;
+declare mycursor cursor for
+ select * from pg-user;
--
--Fetch all the instances available in the cursor FOO
--
- fetch all in FOO;
+fetch all in FOO;
--
--Fetch 5 instances backward in the cursor FOO
--
- fetch backward 5 in FOO;
+fetch backward 5 in FOO;
--
--close
--
- close foo;
-end;
+close foo;
+commit;
.fi
.SH "SEE ALSO"
begin(l),
-end(l),
+commit(l),
close(l),
move(l),
select(l).
diff --git a/src/man/large_objects.3 b/src/man/large_objects.3
index a7dfc38a8d8..8a1920a1975 100644
--- a/src/man/large_objects.3
+++ b/src/man/large_objects.3
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.5 1998/01/11 22:17:41 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.6 1998/03/23 15:09:29 momjian Exp $
.TH "LARGE OBJECTS" INTRO 03/18/94 PostgreSQL PostgreSQL
.SH DESCRIPTION
.PP
@@ -259,7 +259,7 @@ library.
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.5 1998/01/11 22:17:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.6 1998/03/23 15:09:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -458,7 +458,7 @@ main(int argc, char **argv)
exit_nicely(conn);
}
- res = PQexec(conn, "begin");
+ res = PQexec(conn, "begin work;");
PQclear(res);
printf("importing file \\"%s\\" ...\\n", in_filename);
/* lobjOid = importFile(conn, in_filename); */
@@ -477,7 +477,7 @@ main(int argc, char **argv)
/* exportFile(conn, lobjOid, out_filename); */
lo_export(conn, lobjOid,out_filename);
- res = PQexec(conn, "end");
+ res = PQexec(conn, "commit;");
PQclear(res);
PQfinish(conn);
exit(0);
diff --git a/src/man/libpq.3 b/src/man/libpq.3
index 10006001eb9..ac1a03f7aef 100644
--- a/src/man/libpq.3
+++ b/src/man/libpq.3
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.12 1998/01/26 01:42:47 scrappy Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.13 1998/03/23 15:09:30 momjian Exp $
.TH LIBPQ INTRO 03/12/94 PostgreSQL PostgreSQL
.SH DESCRIPTION
Libpq is the programmer's interface to Postgres. Libpq is a set of
@@ -735,8 +735,8 @@ main()
res = PQexec(conn, "CLOSE mycursor");
PQclear(res);
- /* end the transaction */
- res = PQexec(conn, "END");
+ /* commit the transaction */
+ res = PQexec(conn, "COMMIT");
PQclear(res);
/* close the connection to the database and cleanup */
@@ -985,8 +985,8 @@ main()
res = PQexec(conn, "CLOSE mycursor");
PQclear(res);
- /* end the transaction */
- res = PQexec(conn, "END");
+ /* commit the transaction */
+ res = PQexec(conn, "COMMIT");
PQclear(res);
/* close the connection to the database and cleanup */
diff --git a/src/man/lock.l b/src/man/lock.l
index b0b053377ba..440e491b863 100644
--- a/src/man/lock.l
+++ b/src/man/lock.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/lock.l,v 1.4 1998/03/18 15:48:57 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/lock.l,v 1.5 1998/03/23 15:09:34 momjian Exp $
.TH FETCH SQL 01/23/93 PostgreSQL PostgreSQL
.SH NAME
lock - exclusive lock a table
@@ -34,8 +34,8 @@ begin work;
lock table mytable;
select * from mytable;
update mytable set (x = 100);
-end work;
+commit;
.SH "SEE ALSO"
begin(l),
-end(l),
+commit(l),
select(l).
diff --git a/src/man/move.l b/src/man/move.l
index 0617cd5bb19..ab008254556 100644
--- a/src/man/move.l
+++ b/src/man/move.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/move.l,v 1.2 1998/01/11 22:17:44 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/move.l,v 1.3 1998/03/23 15:09:41 momjian Exp $
.TH MOVE SQL 01/23/93 PostgreSQL PostgreSQL
.SH NAME
move - move cursor position
@@ -19,26 +19,26 @@ command: it fetches instances, but put them nowhere.
--
--set up and use a cursor
--
-begin
- declare mycursor cursor for
- select * from pg-user;
+begin work;
+declare mycursor cursor for
+ select * from pg-user;
--
--Move for 5 instances in the cursor FOO
--
- move 5 in FOO;
+move 5 in FOO;
--
--Fetch 6th instance in the cursor FOO
--
- fetch 1 in FOO;
+fetch 1 in FOO;
--
--close
--
- close foo;
-end;
+close foo;
+commit;
.fi
.SH "SEE ALSO"
begin(l),
-end(l),
+commit(l),
close(l),
fetch(l),
select(l).
diff --git a/src/man/rollback.l b/src/man/rollback.l
index 4f44940b9ae..e9c0d350b84 100644
--- a/src/man/rollback.l
+++ b/src/man/rollback.l
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/rollback.l,v 1.3 1998/01/11 22:17:57 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/rollback.l,v 1.4 1998/03/23 15:09:43 momjian Exp $
.TH ROLLBACK SQL 01/20/96 PostgreSQL PostgreSQL
.\" XXX This .XA has to go after the .TH so that the index page number goes
.\" in the right place...
@@ -21,4 +21,4 @@ command.
.SH "SEE ALSO"
abort(l),
begin(l),
-end(l).
+commit(l).