made PARTITION keyword unreserved again

zilder · zilder · commit dd5754794e6c · 2017-01-27T17:43:59.000+03:00
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -673,7 +673,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
  * as NOT, at least with respect to their left-hand subexpression.
  * NULLS_LA and WITH_LA are needed to make the grammar LALR(1).
  */
-%token		NOT_LA NULLS_LA WITH_LA
+%token		NOT_LA NULLS_LA WITH_LA ADD_PARTITION DROP_PARTITION RENAME_PARTITION
 
 
 /* Precedence: lowest to highest */
@@ -2391,7 +2391,7 @@ alter_table_cmd:
 					n->def = (Node *)$1;
 					$$ = (Node *) n;
 				}
-			| ADD_P OptRangePartitionsListElement
+			| ADD_PARTITION OptRangePartitionsListElement
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_AddPartition;
@@ -2440,15 +2440,15 @@ alter_table_cmd:
 
 					$$ = (Node *) n;
 				}
-			| RENAME PARTITION relation_expr TO name
+			| RENAME_PARTITION PARTITION relation_expr TO name
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_RenamePartition;
 					n->partitions = list_make1($3);
 					n->name = $5;
 					$$ = (Node *)n;
 				}
-			| DROP PARTITION qualified_name
+			| DROP_PARTITION PARTITION qualified_name
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropPartition;
@@ -14251,6 +14251,7 @@ unreserved_keyword:
 			| PARALLEL
 			| PARSER
 			| PARTIAL
+			| PARTITION
 			| PARTITIONS
 			| PASSING
 			| PASSWORD
@@ -14527,7 +14528,6 @@ reserved_keyword:
 			| ONLY
 			| OR
 			| ORDER
-			| PARTITION
 			| PLACING
 			| PRIMARY
 			| REFERENCES
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
@@ -116,6 +116,15 @@ base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp, core_yyscan_t yyscanner)
 		case WITH:
 			cur_token_length = 4;
 			break;
+		case ADD_P:
+			cur_token_length = 3;
+			break;
+		case DROP:
+			cur_token_length = 4;
+			break;
+		case RENAME:
+			cur_token_length = 6;
+			break;
 		default:
 			return cur_token;
 	}
@@ -189,6 +198,18 @@ base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp, core_yyscan_t yyscanner)
 					break;
 			}
 			break;
+		case ADD_P:
+			if (next_token == PARTITION)
+				cur_token = ADD_PARTITION;
+			break;
+		case DROP:
+			if (next_token == PARTITION)
+				cur_token = DROP_PARTITION;
+			break;
+		case RENAME:
+			if (next_token == PARTITION)
+				cur_token = RENAME_PARTITION;
+			break;
 	}
 
 	return cur_token;
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
@@ -292,7 +292,7 @@ PG_KEYWORD("owner", OWNER, UNRESERVED_KEYWORD)
 PG_KEYWORD("parallel", PARALLEL, UNRESERVED_KEYWORD)
 PG_KEYWORD("parser", PARSER, UNRESERVED_KEYWORD)
 PG_KEYWORD("partial", PARTIAL, UNRESERVED_KEYWORD)
-PG_KEYWORD("partition", PARTITION, RESERVED_KEYWORD)
+PG_KEYWORD("partition", PARTITION, UNRESERVED_KEYWORD)
 PG_KEYWORD("partitions", PARTITIONS, UNRESERVED_KEYWORD)
 PG_KEYWORD("passing", PASSING, UNRESERVED_KEYWORD)
 PG_KEYWORD("password", PASSWORD, UNRESERVED_KEYWORD)
