diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-05-12 08:57:01 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-05-12 08:57:49 -0400 |
| commit | b807f59828fbc02fea612e1cbc0066c6dfa3be9b (patch) | |
| tree | 3dcd63108c0d721a41f61354e1df73e38e2de3fa /src/backend/parser | |
| parent | 734cb4c2e7de92972c01b6339a3e15ac4bc605dd (diff) | |
Rework the options syntax for logical replication commands
For CREATE/ALTER PUBLICATION/SUBSCRIPTION, use similar option style as
other statements that use a WITH clause for options.
Author: Petr Jelinek <petr.jelinek@2ndquadrant.com>
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 65c004c5096..d04bb7ea3eb 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -338,7 +338,6 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); database_name access_method_clause access_method attr_name name cursor_name file_name index_name opt_index_name cluster_index_specification - def_key %type <list> func_name handler_name qual_Op qual_all_Op subquery_Op opt_class opt_inline_handler opt_validator validator_clause @@ -652,7 +651,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); MAPPING MATCH MATERIALIZED MAXVALUE METHOD MINUTE_P MINVALUE MODE MONTH_P MOVE NAME_P NAMES NATIONAL NATURAL NCHAR NEW NEXT NO NONE - NOREFRESH NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLIF + NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLIF NULLS_P NUMERIC OBJECT_P OF OFF OFFSET OIDS OLD ON ONLY OPERATOR OPTION OPTIONS OR @@ -5673,21 +5672,16 @@ def_list: def_elem { $$ = list_make1($1); } | def_list ',' def_elem { $$ = lappend($1, $3); } ; -def_elem: def_key '=' def_arg +def_elem: ColLabel '=' def_arg { $$ = makeDefElem($1, (Node *) $3, @1); } - | def_key + | ColLabel { $$ = makeDefElem($1, NULL, @1); } ; -def_key: - ColLabel { $$ = $1; } - | ColLabel ColLabel { $$ = psprintf("%s %s", $1, $2); } - ; - /* Note: any simple identifier will be returned as a type name! */ def_arg: func_type { $$ = (Node *)$1; } | reserved_keyword { $$ = (Node *)makeString(pstrdup($1)); } @@ -9173,9 +9167,10 @@ publication_for_tables: } ; + /***************************************************************************** * - * ALTER PUBLICATION name [ WITH ] options + * ALTER PUBLICATION name SET ( options ) * * ALTER PUBLICATION name ADD TABLE table [, table2] * @@ -9186,7 +9181,7 @@ publication_for_tables: *****************************************************************************/ AlterPublicationStmt: - ALTER PUBLICATION name WITH definition + ALTER PUBLICATION name SET definition { AlterPublicationStmt *n = makeNode(AlterPublicationStmt); n->pubname = $3; @@ -9254,12 +9249,12 @@ publication_name_item: /***************************************************************************** * - * ALTER SUBSCRIPTION name [ WITH ] options + * ALTER SUBSCRIPTION name ... * *****************************************************************************/ AlterSubscriptionStmt: - ALTER SUBSCRIPTION name WITH definition + ALTER SUBSCRIPTION name SET definition { AlterSubscriptionStmt *n = makeNode(AlterSubscriptionStmt); @@ -9296,7 +9291,7 @@ AlterSubscriptionStmt: n->options = $8; $$ = (Node *)n; } - | ALTER SUBSCRIPTION name SET PUBLICATION publication_name_list NOREFRESH + | ALTER SUBSCRIPTION name SET PUBLICATION publication_name_list SKIP REFRESH { AlterSubscriptionStmt *n = makeNode(AlterSubscriptionStmt); @@ -14758,7 +14753,6 @@ unreserved_keyword: | NEW | NEXT | NO - | NOREFRESH | NOTHING | NOTIFY | NOWAIT |