Horton

Remove the NODROP SLOT option from DROP SUBSCRIPTION

Peter Eisentraut <peter_e@gmx.net>

View on postgr.es
Commit: 013c1178fd0adefa0f68d5ce2d84e7ae6f9613a1
Author: Peter Eisentraut <peter_e@gmx.net>
Date: 2017-05-09T14:20:42Z
Releases: 10.0 
Remove the NODROP SLOT option from DROP SUBSCRIPTION

It turned out this approach had problems, because a DROP command should
not have any options other than CASCADE and RESTRICT.  Instead, always
attempt to drop the slot if there is one configured, but also add an
ALTER SUBSCRIPTION action to set the slot to NONE.

Author: Petr Jelinek <petr.jelinek@2ndquadrant.com>
Reported-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/29431.1493730652@sss.pgh.pa.us

Files

PathChange+/−
doc/src/sgml/ref/create_subscription.sgml modified +9 −0
doc/src/sgml/ref/drop_subscription.sgml modified +9 −14
src/backend/catalog/pg_subscription.c modified +6 −3
src/backend/commands/subscriptioncmds.c modified +105 −36
src/backend/nodes/copyfuncs.c modified +1 −1
src/backend/nodes/equalfuncs.c modified +1 −1
src/backend/parser/gram.y modified +19 −28
src/backend/replication/logical/worker.c modified +19 −16
src/bin/psql/tab-complete.c modified +1 −5
src/include/catalog/catversion.h modified +1 −1
src/include/catalog/pg_subscription.h modified +1 −1
src/include/nodes/parsenodes.h modified +1 −1
src/include/parser/kwlist.h modified +0 −1
src/test/modules/dummy_seclabel/expected/dummy_seclabel.out modified +2 −2
src/test/modules/dummy_seclabel/sql/dummy_seclabel.sql modified +2 −2
src/test/regress/expected/object_address.out modified +2 −2
src/test/regress/expected/subscription.out modified +8 −6
src/test/regress/sql/object_address.sql modified +2 −2
src/test/regress/sql/subscription.sql modified +8 −5
src/test/subscription/t/001_rep_changes.pl modified +1 −1

Documentation touched

Discussion