diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-09-22 15:01:13 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-09-22 15:02:13 -0400 |
| commit | e114289e1e4774dfc3371372e36b3f0fed66b741 (patch) | |
| tree | fe314d318a6ae2ed8caacb158c702f4d75b9d5f4 | |
| parent | 1a44df007c9b9adc5e6082fc90fe68e615d38ecd (diff) | |
| download | postgresql-e114289e1e4774dfc3371372e36b3f0fed66b741.tar.gz postgresql-e114289e1e4774dfc3371372e36b3f0fed66b741.zip | |
doc: Document commands that cannot be run in a transaction block
Mainly covering the new CREATE SUBSCRIPTION and DROP SUBSCRIPTION, but
ALTER DATABASE SET TABLESPACE was also missing.
| -rw-r--r-- | doc/src/sgml/ref/alter_database.sgml | 4 | ||||
| -rw-r--r-- | doc/src/sgml/ref/create_subscription.sgml | 10 | ||||
| -rw-r--r-- | doc/src/sgml/ref/drop_subscription.sgml | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index cfc28cf9a77..9ab86127afa 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -164,6 +164,10 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL <para> The new default tablespace of the database. </para> + + <para> + This form of the command cannot be executed inside a transaction block. + </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml index 9f45b6f574a..de505ea8d37 100644 --- a/doc/src/sgml/ref/create_subscription.sgml +++ b/doc/src/sgml/ref/create_subscription.sgml @@ -49,11 +49,6 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl </para> <para> - <command>CREATE SUBSCRIPTION</command> cannot be executed inside a - transaction block when the parameter <literal>create_slot</literal> is specified. - </para> - - <para> Additional info about subscriptions and logical replication as a whole can is available at <xref linkend="logical-replication-subscription"> and <xref linkend="logical-replication">. @@ -228,6 +223,11 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl </para> <para> + When creating a replication slot (the default behavior), <command>CREATE + SUBSCRIPTION</command> cannot be executed inside a transaction block. + </para> + + <para> Creating a subscription that connects to the same database cluster (for example, to replicate between databases in the same cluster or to replicate within the same database) will only succeed if the replication slot is not diff --git a/doc/src/sgml/ref/drop_subscription.sgml b/doc/src/sgml/ref/drop_subscription.sgml index f535c000c40..f5734e6f300 100644 --- a/doc/src/sgml/ref/drop_subscription.sgml +++ b/doc/src/sgml/ref/drop_subscription.sgml @@ -93,6 +93,11 @@ DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable reserve WAL and might eventually cause the disk to fill up. See also <xref linkend="logical-replication-subscription-slot">. </para> + + <para> + If a subscription is associated with a replication slot, then <command>DROP + SUBSCRIPTION</command> cannot be executed inside a transaction block. + </para> </refsect1> <refsect1> |