Fix parsing of DROP SUBSCRIPTION ... DROP SLOT

petere · petere · commit 347302730dc3 · 2017-03-03T23:29:13.000-05:00
It didn't actually parse before.

Reported-by: Masahiko Sawada &lt;sawada.mshk@gmail.com&gt;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -9196,11 +9196,13 @@ DropSubscriptionStmt: DROP SUBSCRIPTION name opt_drop_slot
 		;
 
 opt_drop_slot:
-			IDENT SLOT
+			DROP SLOT
 				{
-					if (strcmp($1, "drop") == 0)
-						$$ = TRUE;
-					else if (strcmp($1, "nodrop") == 0)
+					$$ = TRUE;
+				}
+			| IDENT SLOT
+				{
+					if (strcmp($1, "nodrop") == 0)
 						$$ = FALSE;
 					else
 						ereport(ERROR,
diff --git a/src/test/subscription/t/001_rep_changes.pl b/src/test/subscription/t/001_rep_changes.pl
@@ -179,7 +179,7 @@
   or die "Timed out while waiting for apply to restart";
 
 # check all the cleanup
-$node_subscriber->safe_psql('postgres', "DROP SUBSCRIPTION tap_sub_renamed");
+$node_subscriber->safe_psql('postgres', "DROP SUBSCRIPTION tap_sub_renamed DROP SLOT");
 
 $result =
   $node_subscriber->safe_psql('postgres', "SELECT count(*) FROM pg_subscription");
