From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Tue, 7 Jun 2011 05:14:28 +0000 (+0900)
Subject: Remove unnecessary gram.y syntax element "opt_create_generic_options".
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=3c1bc15179fe8e78d60eef123489d810f86704af;p=users%2Fhanada%2Fpostgres.git

Remove unnecessary gram.y syntax element "opt_create_generic_options".
---

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 5b1c143c78..1ff61e0939 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -319,7 +319,6 @@ static void processCASbits(int cas_bits, int location, const char *constrType,
 				prep_type_clause
 				execute_param_clause using_clause returning_clause
 				opt_enum_val_list enum_val_list table_func_column_list
-				opt_create_generic_options
 				create_generic_options alter_generic_options
 				relation_expr_list dostmt_opt_list
 
@@ -3610,7 +3609,7 @@ AlterExtensionContentsStmt:
  *
  *****************************************************************************/
 
-CreateFdwStmt: CREATE FOREIGN DATA_P WRAPPER name opt_fdw_options opt_create_generic_options
+CreateFdwStmt: CREATE FOREIGN DATA_P WRAPPER name opt_fdw_options create_generic_options
 				{
 					CreateFdwStmt *n = makeNode(CreateFdwStmt);
 					n->fdwname = $5;
@@ -3688,13 +3687,9 @@ AlterFdwStmt: ALTER FOREIGN DATA_P WRAPPER name opt_fdw_options alter_generic_op
 		;
 
 /* Options definition for CREATE FDW, SERVER and USER MAPPING */
-opt_create_generic_options:
-			create_generic_options						{ $$ = $1 }
-			| /*EMPTY*/									{ $$ = NIL }
-		;
-
 create_generic_options:
 			OPTIONS '(' generic_option_list ')'			{ $$ = $3; }
+			| /*EMPTY*/									{ $$ = NIL }
 		;
 
 generic_option_list:
@@ -3769,7 +3764,7 @@ generic_option_arg:
  *****************************************************************************/
 
 CreateForeignServerStmt: CREATE SERVER name opt_type opt_foreign_server_version
-						 FOREIGN DATA_P WRAPPER name opt_create_generic_options
+						 FOREIGN DATA_P WRAPPER name create_generic_options
 				{
 					CreateForeignServerStmt *n = makeNode(CreateForeignServerStmt);
 					n->servername = $3;
@@ -3865,7 +3860,7 @@ AlterForeignServerStmt: ALTER SERVER name foreign_server_version alter_generic_o
 CreateForeignTableStmt:
 		CREATE FOREIGN TABLE qualified_name
 			OptForeignTableElementList
-			SERVER name opt_create_generic_options
+			SERVER name create_generic_options
 				{
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
 					$4->relpersistence = RELPERSISTENCE_PERMANENT;
@@ -3880,7 +3875,7 @@ CreateForeignTableStmt:
 				}
 		| CREATE FOREIGN TABLE IF_P NOT EXISTS qualified_name
 			OptForeignTableElementList
-			SERVER name opt_create_generic_options
+			SERVER name create_generic_options
 				{
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
 					$7->relpersistence = RELPERSISTENCE_PERMANENT;
@@ -3940,7 +3935,7 @@ AlterForeignTableStmt:
  *
  *****************************************************************************/
 
-CreateUserMappingStmt: CREATE USER MAPPING FOR auth_ident SERVER name opt_create_generic_options
+CreateUserMappingStmt: CREATE USER MAPPING FOR auth_ident SERVER name create_generic_options
 				{
 					CreateUserMappingStmt *n = makeNode(CreateUserMappingStmt);
 					n->username = $5;