diff --git a/src/common/backend/parser/gram.y b/src/common/backend/parser/gram.y index a0ebc3773..4b7bb5846 100644 --- a/src/common/backend/parser/gram.y +++ b/src/common/backend/parser/gram.y @@ -25977,16 +25977,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 @@ -26028,9 +26028,10 @@ unreserved_keyword: | CONSTRAINTS | CONTENT_P | CONTINUE_P + | CONTVIEW | CONVERSION_P - | CONTVIEW | COORDINATOR + | COORDINATORS | COPY | COST | CSV @@ -26044,8 +26045,8 @@ unreserved_keyword: | DATANODE | DATANODES | DATATYPE_CL - | DAY_P | DATE_FORMAT_P + | DAY_P | DBCOMPATIBILITY_P | DEALLOCATE | DECLARE @@ -26073,6 +26074,7 @@ unreserved_keyword: | DROP | DUPLICATE | EACH + | ELASTIC | ENABLE_P | ENCLOSED | ENCODING @@ -26099,10 +26101,11 @@ unreserved_keyword: | FAMILY | FAST | FEATURES // DB4AI + | FENCED | FIELDS | FILEHEADER_P - | FILL_MISSING_FIELDS | FILLER + | FILL_MISSING_FIELDS | FILTER | FIRST_P | FIXED_P @@ -26140,10 +26143,10 @@ unreserved_keyword: | INITRANS | INLINE_P | INPUT_P - | INTERNAL | INSENSITIVE | INSERT | INSTEAD + | INTERNAL | INVOKER | IP | ISNULL @@ -26170,8 +26173,8 @@ unreserved_keyword: | LOG_P | LOGGING | LOGIN_ANY - | LOGIN_SUCCESS | LOGIN_FAILURE + | LOGIN_SUCCESS | LOGOUT | LOOP | MAPPING @@ -26246,6 +26249,7 @@ unreserved_keyword: | PREPARED | PRESERVE | PRIOR + | PRIORER | PRIVATE | PRIVILEGE | PRIVILEGES @@ -26295,6 +26299,7 @@ unreserved_keyword: | ROLLUP | ROTATION | ROWS + | ROWTYPE_P | RULE | SAMPLE | SAVEPOINT @@ -26303,6 +26308,7 @@ unreserved_keyword: | SEARCH | SECOND_P | SECURITY + | SEPARATOR_P | SEQUENCE | SEQUENCES | SERIALIZABLE @@ -26310,7 +26316,6 @@ unreserved_keyword: | SESSION | SET | SETS - | SEPARATOR_P | SHARE | SHIPPABLE | SHOW @@ -26344,8 +26349,8 @@ unreserved_keyword: | SUBPARTITION | SUBSCRIPTION | SYNONYM - | SYS_REFCURSOR { $$ = "refcursor"; } | SYSID + | SYS_REFCURSOR { $$ = "refcursor"; } | SYSTEM_P | TABLES | TABLESPACE @@ -26356,8 +26361,8 @@ unreserved_keyword: | TERMINATED | TEXT_P | THAN - | TIME_FORMAT_P | TIMESTAMP_FORMAT_P + | TIME_FORMAT_P | TRANSACTION | TRANSFORM | TRIGGER @@ -26388,6 +26393,7 @@ unreserved_keyword: | VALUE_P | VARIABLES | VARYING + | VCGROUP | VERSION_P | VIEW | VOLATILE @@ -26639,8 +26645,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 d7230a304..650a48cae 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);