From 3ce149ee568d4ac7f9379d0608381c87f6ce563f Mon Sep 17 00:00:00 2001
From: "dongxu.wei" <dongxu.wei@enmotech.com>
Date: Tue, 20 Sep 2022 19:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9check=5Fkeywords.pl=E4=B8=ADg?=
 =?UTF-8?q?ram.y=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E3=80=82=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E3=80=82=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97gram.y=E5=92=8Ckwlist.h=E4=B8=8D=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E7=9A=84=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/backend/parser/gram.y | 28 +++++++++++++++++-----------
 src/include/parser/kwlist.h      |  4 ++--
 src/tools/check_keywords.pl      |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/common/backend/parser/gram.y b/src/common/backend/parser/gram.y
index e2fde0431..b7f40f504 100644
--- a/src/common/backend/parser/gram.y
+++ b/src/common/backend/parser/gram.y
@@ -25758,16 +25758,16 @@ unreserved_keyword:
 			| AT
 			| ATTRIBUTE
 			| AUDIT
-			| AUTO_INCREMENT
 			| AUTOEXTEND
 			| AUTOMAPPED
+			| AUTO_INCREMENT
 			| BACKWARD
 /* PGXC_BEGIN */
 			| BARRIER
 /* PGXC_END */
 			| BEFORE
-			| BEGIN_NON_ANOYBLOCK
 			| BEGIN_P
+			| BEGIN_NON_ANOYBLOCK
 			| BLANKS
 			| BLOB_P
 			| BLOCKCHAIN
@@ -25809,9 +25809,10 @@ unreserved_keyword:
 			| CONSTRAINTS
 			| CONTENT_P
 			| CONTINUE_P
+			| CONTVIEW
 			| CONVERSION_P
-            | CONTVIEW
 			| COORDINATOR
+			| COORDINATORS
 			| COPY
 			| COST
 			| CSV
@@ -25825,8 +25826,8 @@ unreserved_keyword:
 			| DATANODE
 			| DATANODES
 			| DATATYPE_CL
-			| DAY_P
 			| DATE_FORMAT_P
+			| DAY_P
 			| DBCOMPATIBILITY_P
 			| DEALLOCATE
 			| DECLARE
@@ -25854,6 +25855,7 @@ unreserved_keyword:
 			| DROP
 			| DUPLICATE
 			| EACH
+			| ELASTIC
 			| ENABLE_P
 			| ENCLOSED
 			| ENCODING
@@ -25880,10 +25882,11 @@ unreserved_keyword:
 			| FAMILY
 			| FAST
 			| FEATURES 			// DB4AI
+			| FENCED
 			| FIELDS
 			| FILEHEADER_P
-			| FILL_MISSING_FIELDS
 			| FILLER
+			| FILL_MISSING_FIELDS
 			| FILTER
 			| FIRST_P
 			| FIXED_P
@@ -25921,10 +25924,10 @@ unreserved_keyword:
 			| INITRANS
 			| INLINE_P
 			| INPUT_P
-			| INTERNAL
 			| INSENSITIVE
 			| INSERT
 			| INSTEAD
+			| INTERNAL
 			| INVOKER
 			| IP
 			| ISNULL
@@ -25951,8 +25954,8 @@ unreserved_keyword:
 			| LOG_P
 			| LOGGING
 			| LOGIN_ANY
-			| LOGIN_SUCCESS
 			| LOGIN_FAILURE
+			| LOGIN_SUCCESS
 			| LOGOUT
 			| LOOP
 			| MAPPING
@@ -26027,6 +26030,7 @@ unreserved_keyword:
 			| PREPARED
 			| PRESERVE
 			| PRIOR
+			| PRIORER
 			| PRIVATE
 			| PRIVILEGE
 			| PRIVILEGES
@@ -26075,6 +26079,7 @@ unreserved_keyword:
 			| ROLLUP
 			| ROTATION
 			| ROWS
+			| ROWTYPE_P
 			| RULE
 			| SAMPLE
 			| SAVEPOINT
@@ -26083,6 +26088,7 @@ unreserved_keyword:
 			| SEARCH
 			| SECOND_P
 			| SECURITY
+			| SEPARATOR_P
 			| SEQUENCE
 			| SEQUENCES
 			| SERIALIZABLE
@@ -26090,7 +26096,6 @@ unreserved_keyword:
 			| SESSION
 			| SET
 			| SETS
-			| SEPARATOR_P
 			| SHARE
 			| SHIPPABLE
 			| SHOW
@@ -26124,8 +26129,8 @@ unreserved_keyword:
 			| SUBPARTITION
 			| SUBSCRIPTION
 			| SYNONYM
-			| SYS_REFCURSOR					{ $$ = "refcursor"; }
 			| SYSID
+			| SYS_REFCURSOR					{ $$ = "refcursor"; }
 			| SYSTEM_P
 			| TABLES
 			| TABLESPACE
@@ -26136,8 +26141,8 @@ unreserved_keyword:
 			| TERMINATED
 			| TEXT_P
 			| THAN
-			| TIME_FORMAT_P
 			| TIMESTAMP_FORMAT_P
+			| TIME_FORMAT_P
 			| TRANSACTION
 			| TRANSFORM
 			| TRIGGER
@@ -26168,6 +26173,7 @@ unreserved_keyword:
 			| VALUE_P
 			| VARIABLES
 			| VARYING
+			| VCGROUP
 			| VERSION_P
 			| VIEW
 			| VOLATILE
@@ -26418,8 +26424,8 @@ reserved_keyword:
 			| MAXVALUE
 			| MINUS_P
 			| MODIFY_P
+			| NOCYCLE
 			| NOT
-                        | NOCYCLE
 			| NULL_P
 			| OFFSET
 			| ON
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index a414dff55..16033e352 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -239,7 +239,7 @@ PG_KEYWORD("false", FALSE_P, RESERVED_KEYWORD)
 PG_KEYWORD("family", FAMILY, UNRESERVED_KEYWORD)
 PG_KEYWORD("fast", FAST, UNRESERVED_KEYWORD)
 PG_KEYWORD("features", FEATURES, UNRESERVED_KEYWORD)
-PG_KEYWORD("fenced", FENCED, RESERVED_KEYWORD)
+PG_KEYWORD("fenced", FENCED, UNRESERVED_KEYWORD)
 PG_KEYWORD("fetch", FETCH, RESERVED_KEYWORD)
 PG_KEYWORD("fields", FIELDS, UNRESERVED_KEYWORD)
 PG_KEYWORD("fileheader", FILEHEADER_P, UNRESERVED_KEYWORD)
@@ -455,7 +455,7 @@ PG_KEYWORD("prepared", PREPARED, UNRESERVED_KEYWORD)
 PG_KEYWORD("preserve", PRESERVE, UNRESERVED_KEYWORD)
 PG_KEYWORD("primary", PRIMARY, RESERVED_KEYWORD)
 PG_KEYWORD("prior", PRIOR, UNRESERVED_KEYWORD)
-PG_KEYWORD("priorer", PRIORER, RESERVED_KEYWORD)
+PG_KEYWORD("priorer", PRIORER, UNRESERVED_KEYWORD)
 PG_KEYWORD("private", PRIVATE, UNRESERVED_KEYWORD)
 PG_KEYWORD("privilege", PRIVILEGE, UNRESERVED_KEYWORD)
 PG_KEYWORD("privileges", PRIVILEGES, UNRESERVED_KEYWORD)
diff --git a/src/tools/check_keywords.pl b/src/tools/check_keywords.pl
index 77fbd9a44..1a7a4a217 100644
--- a/src/tools/check_keywords.pl
+++ b/src/tools/check_keywords.pl
@@ -35,7 +35,7 @@ $keyword_categories{'col_name_keyword'}       = 'COL_NAME_KEYWORD';
 $keyword_categories{'type_func_name_keyword'} = 'TYPE_FUNC_NAME_KEYWORD';
 $keyword_categories{'reserved_keyword'}       = 'RESERVED_KEYWORD';
 
-my $gram_filename = "$path/src/backend/parser/gram.y";
+my $gram_filename = "$path/src/common/backend/parser/gram.y";
 open(GRAM, $gram_filename) || die("Could not open : $gram_filename");
 
 my ($S, $s, $k, $n, $kcat);