Change COLLATION keyword category

It was changed from unreserved to reserved as part of the COLLATION
FOR syntax, but it turns out that type_func_name_keyword is
sufficient.

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 154854f140bea2526400b899b6c0667ce3f37aa4..9eb1bed58e65b0a2d35a18b639ece82cf1533722 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -12528,6 +12528,7 @@ col_name_keyword:
 type_func_name_keyword:
              AUTHORIZATION
            | BINARY
+           | COLLATION
            | CONCURRENTLY
            | CROSS
            | CURRENT_SCHEMA
@@ -12571,7 +12572,6 @@ reserved_keyword:
            | CAST
            | CHECK
            | COLLATE
-           | COLLATION
            | COLUMN
            | CONSTRAINT
            | CREATE

diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index 9f6f6d354f3c0124b291fccb6f7702df2a9a7b7d..ab88350037796968068368fa094661c6b41ec5ce 100644 (file)
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -79,7 +79,7 @@ PG_KEYWORD("close", CLOSE, UNRESERVED_KEYWORD)
 PG_KEYWORD("cluster", CLUSTER, UNRESERVED_KEYWORD)
 PG_KEYWORD("coalesce", COALESCE, COL_NAME_KEYWORD)
 PG_KEYWORD("collate", COLLATE, RESERVED_KEYWORD)
-PG_KEYWORD("collation", COLLATION, RESERVED_KEYWORD)
+PG_KEYWORD("collation", COLLATION, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("column", COLUMN, RESERVED_KEYWORD)
 PG_KEYWORD("comment", COMMENT, UNRESERVED_KEYWORD)
 PG_KEYWORD("comments", COMMENTS, UNRESERVED_KEYWORD)