postgres
diff --git a/‎doc/src/sgml/ref/create_subscription.sgml
Lines changed: 9 additions & 0 deletions b/‎doc/src/sgml/ref/create_subscription.sgml
Lines changed: 9 additions & 0 deletions
diff --git a/‎doc/src/sgml/ref/drop_subscription.sgml
Lines changed: 9 additions & 14 deletions b/‎doc/src/sgml/ref/drop_subscription.sgml
Lines changed: 9 additions & 14 deletions
diff --git a/‎src/backend/catalog/pg_subscription.c
Lines changed: 6 additions & 3 deletions b/‎src/backend/catalog/pg_subscription.c
Lines changed: 6 additions & 3 deletions
@@ -133,6 +133,15 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
       Name of the replication slot to use. The default behavior is to use
       <literal>subscription_name</> for slot name.
      </para>
+
+     <para>
+      When <literal>SLOT NAME</literal> is set to
+      <literal>NONE</literal>, there will be no replication slot associated
+      with the subscription.  This can be used if the replication slot will be
+      created later manually.  Such subscriptions must also have both
+      <literal>ENABLED</literal> and <literal>CREATE SLOT</literal> set
+      to <literal>false</literal>.
+     </para>
     </listitem>
    </varlistentry>
 
 
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ DROP SLOT | NODROP SLOT ]
+DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -39,7 +39,9 @@ DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable
 
   <para>
    <command>DROP SUBSCRIPTION</command> cannot be executed inside a
-   transaction block when <literal>DROP SLOT</literal> is specified.
+   transaction block if the subscription is associated with a replication
+   slot.  (You can use <command>ALTER SUBSCRIPTION</command> to unset the
+   slot.)
   </para>
  </refsect1>
 
@@ -57,20 +59,13 @@ DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable
    </varlistentry>
 
    <varlistentry>
-    <term><literal>DROP SLOT</literal></term>
-    <term><literal>NODROP SLOT</literal></term>
-    <listitem>
-     <para>
-      Specifies whether to drop the replication slot on the publisher.  The
-      default is
-      <literal>DROP SLOT</literal>.
-     </para>
+    <term><literal>CASCADE</literal></term>
+    <term><literal>RESTRICT</literal></term>
 
+    <listitem>
      <para>
-      If the publisher is not reachable when the subscription is to be
-      dropped, then it is useful to specify <literal>NODROP SLOT</literal>.
-      But the replication slot on the publisher will then have to be removed
-      manually.
+      These key words do not have any effect, since there are no dependencies
+      on subscriptions.
      </para>
     </listitem>
    </varlistentry>
 
@@ -82,8 +82,10 @@ GetSubscription(Oid subid, bool missing_ok)
 							tup,
 							Anum_pg_subscription_subslotname,
 							&isnull);
-	Assert(!isnull);
-	sub->slotname = pstrdup(NameStr(*DatumGetName(datum)));
+	if (!isnull)
+		sub->slotname = pstrdup(NameStr(*DatumGetName(datum)));
+	else
+		sub->slotname = NULL;
 
 	/* Get synccommit */
 	datum = SysCacheGetAttr(SUBSCRIPTIONOID,
@@ -147,7 +149,8 @@ FreeSubscription(Subscription *sub)
 {
 	pfree(sub->name);
 	pfree(sub->conninfo);
-	pfree(sub->slotname);
+	if (sub->slotname)
+		pfree(sub->slotname);
 	list_free_deep(sub->publications);
 	pfree(sub);
 }