diff options
| author | Fujii Masao | 2015-04-09 02:31:42 +0000 |
|---|---|---|
| committer | Fujii Masao | 2015-04-09 02:31:42 +0000 |
| commit | 17d436d2e894a91f3e8a9eb1bb1688cb515f1546 (patch) | |
| tree | eeed724a589fc272b46646827358d49435b7997e | |
| parent | 73206812cd97436cffd8f331dbb09d38a2728162 (diff) | |
Remove obsolete FORCE option from REINDEX.
FORCE option has been marked "obsolete" since very old version 7.4
but existed for backwards compatibility. Per discussion on pgsql-hackers,
we concluded that it's no longer worth keeping supporting the option.
| -rw-r--r-- | doc/src/sgml/ref/reindex.sgml | 11 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 20 |
2 files changed, 8 insertions, 23 deletions
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 0a4c7d45cb..998340c5db 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> [ FORCE ] +REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> </synopsis> </refsynopsisdiv> @@ -150,15 +150,6 @@ REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAM </para> </listitem> </varlistentry> - - <varlistentry> - <term><literal>FORCE</literal></term> - <listitem> - <para> - This is an obsolete option; it is ignored if specified. - </para> - </listitem> - </varlistentry> </variablelist> </refsect1> diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 88ec83c7c3..5818858a29 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -283,7 +283,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); %type <ival> opt_lock lock_type cast_context %type <ival> vacuum_option_list vacuum_option_elem -%type <boolean> opt_force opt_or_replace +%type <boolean> opt_or_replace opt_grant_grant_option opt_grant_admin_option opt_nowait opt_if_exists opt_with_data %type <ival> opt_nowait_or_skip @@ -7301,13 +7301,11 @@ opt_if_exists: IF_P EXISTS { $$ = TRUE; } * * QUERY: * - * REINDEX type <name> [FORCE] - * - * FORCE no longer does anything, but we accept it for backwards compatibility + * REINDEX type <name> *****************************************************************************/ ReindexStmt: - REINDEX INDEX qualified_name opt_force + REINDEX INDEX qualified_name { ReindexStmt *n = makeNode(ReindexStmt); n->kind = REINDEX_OBJECT_INDEX; @@ -7315,7 +7313,7 @@ ReindexStmt: n->name = NULL; $$ = (Node *)n; } - | REINDEX TABLE qualified_name opt_force + | REINDEX TABLE qualified_name { ReindexStmt *n = makeNode(ReindexStmt); n->kind = REINDEX_OBJECT_TABLE; @@ -7323,7 +7321,7 @@ ReindexStmt: n->name = NULL; $$ = (Node *)n; } - | REINDEX SCHEMA name opt_force + | REINDEX SCHEMA name { ReindexStmt *n = makeNode(ReindexStmt); n->kind = REINDEX_OBJECT_SCHEMA; @@ -7331,7 +7329,7 @@ ReindexStmt: n->relation = NULL; $$ = (Node *)n; } - | REINDEX SYSTEM_P name opt_force + | REINDEX SYSTEM_P name { ReindexStmt *n = makeNode(ReindexStmt); n->kind = REINDEX_OBJECT_SYSTEM; @@ -7339,7 +7337,7 @@ ReindexStmt: n->relation = NULL; $$ = (Node *)n; } - | REINDEX DATABASE name opt_force + | REINDEX DATABASE name { ReindexStmt *n = makeNode(ReindexStmt); n->kind = REINDEX_OBJECT_DATABASE; @@ -7349,10 +7347,6 @@ ReindexStmt: } ; -opt_force: FORCE { $$ = TRUE; } - | /* EMPTY */ { $$ = FALSE; } - ; - /***************************************************************************** * |