From 3db22794b76eb0548f002f02a607ebcd101fc68e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 17 May 2017 12:22:56 -0400 Subject: Add more tests for CREATE SUBSCRIPTION Add some tests for parsing different option combinations. Fix some of the resulting error messages for recent changes in option naming. Author: Masahiko Sawada --- src/backend/commands/subscriptioncmds.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/backend/commands') diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index 265f2efd622..1f7274bc572 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -181,17 +181,17 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given, if (enabled && *enabled_given && *enabled) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("noconnect and enabled are mutually exclusive options"))); + errmsg("connect = false and enabled = true are mutually exclusive options"))); if (create_slot && create_slot_given && *create_slot) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("noconnect and create slot are mutually exclusive options"))); + errmsg("connect = false and create_slot = true are mutually exclusive options"))); if (copy_data && copy_data_given && *copy_data) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("noconnect and copy data are mutually exclusive options"))); + errmsg("connect = false and copy_data = true are mutually exclusive options"))); /* Change the defaults of other options. */ *enabled = false; @@ -208,12 +208,12 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given, if (enabled && *enabled_given && *enabled) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("slot_name = NONE and enabled are mutually exclusive options"))); + errmsg("slot_name = NONE and enabled = true are mutually exclusive options"))); if (create_slot && create_slot_given && *create_slot) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("slot_name = NONE and create slot are mutually exclusive options"))); + errmsg("slot_name = NONE and create_slot = true are mutually exclusive options"))); } } -- cgit v1.2.3