diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2010-01-25 18:23:10 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2010-01-25 18:23:10 +0000 |
| commit | 1d1f425f8d4331ecf09512386880af0827cd6091 (patch) | |
| tree | 538d3a13f05b8aa2b1b87bc67180fffd21bca790 | |
| parent | e7dcfd05f3f0ac4c80d5bd26973a748230f9cbe1 (diff) | |
| download | postgresql-1d1f425f8d4331ecf09512386880af0827cd6091.tar.gz postgresql-1d1f425f8d4331ecf09512386880af0827cd6091.zip | |
Add note that PREPARE TRANSACTION is for transaction managers, not
regular applications. Also add a comment pointing out that tab-complition
for PREPARE TRANSACTION is missing on purpose.
| -rw-r--r-- | doc/src/sgml/ref/prepare_transaction.sgml | 11 | ||||
| -rw-r--r-- | src/bin/psql/tab-complete.c | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml index b8b8d8aca83..da304c72550 100644 --- a/doc/src/sgml/ref/prepare_transaction.sgml +++ b/doc/src/sgml/ref/prepare_transaction.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/prepare_transaction.sgml,v 1.9 2009/04/23 00:23:45 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/prepare_transaction.sgml,v 1.10 2010/01/25 18:23:10 heikki Exp $ PostgreSQL documentation --> @@ -83,6 +83,15 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable> <title>Notes</title> <para> + <command>PREPARE TRANSACTION</> is not intended for use in applications + or interactive sessions. It's purpose is to allow an external + transaction manager to perform atomic global transactions across multiple + databases or other transactional resources. Unless you're writing a + transaction manager, you probably shouldn't be using <command>PREPARE + TRANSACTION</>. + </para> + + <para> This command must be used inside a transaction block. Use <xref linkend="sql-begin" endterm="sql-begin-title"> to start one. </para> diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index da2011074ba..cecd88d522a 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.191 2010/01/22 16:40:19 rhaas Exp $ + * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.192 2010/01/25 18:23:09 heikki Exp $ */ /*---------------------------------------------------------------------- @@ -1882,6 +1882,11 @@ psql_completion(char *text, int start, int end) COMPLETE_WITH_LIST(list_PREPARE); } +/* + * PREPARE TRANSACTION is missing on purpose. It's intended for transaction + * managers, not for manual use in interactive sessions. + */ + /* REASSIGN OWNED BY xxx TO yyy */ else if (pg_strcasecmp(prev_wd, "REASSIGN") == 0) COMPLETE_WITH_CONST("OWNED"); |