doc: Document commands that cannot be run in a transaction block
authorPeter Eisentraut <peter_e@gmx.net>
Fri, 22 Sep 2017 19:01:13 +0000 (15:01 -0400)
committerPeter Eisentraut <peter_e@gmx.net>
Fri, 22 Sep 2017 19:01:13 +0000 (15:01 -0400)
Mainly covering the new CREATE SUBSCRIPTION and DROP SUBSCRIPTION, but
ALTER DATABASE SET TABLESPACE was also missing.

doc/src/sgml/ref/alter_database.sgml
doc/src/sgml/ref/create_subscription.sgml
doc/src/sgml/ref/drop_subscription.sgml

index cfc28cf9a7708b9a278117b02cd73f223b2ef6f0..9ab86127afaea16260e1a50ddf724e0f23b3173d 100644 (file)
@@ -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>
 
index 9f45b6f574ac86600c726647ccc9df57be868897..de505ea8d37df227a7a0d84f74409ffbb384f111 100644 (file)
@@ -48,11 +48,6 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
    subscription at the commit of the transaction where this command is run.
   </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
@@ -227,6 +222,11 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
    publication instance.
   </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
index f535c000c4094e9bfb305f4a81a43261fe52e8e2..f5734e6f300a28d6892208cf4f59dea93b6440a2 100644 (file)
@@ -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>