diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-05-16 20:19:44 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-05-16 20:19:44 +0300 |
| commit | be6d1c88a4e6f563adac54483f3fc07ed8d8d99e (patch) | |
| tree | 80e7e850da78aabfb7a799511bab16a0b224827a /src | |
| parent | 488c6dd1708a2c4a9e9f307001f28c05c48651bd (diff) | |
| download | postgresql-be6d1c88a4e6f563adac54483f3fc07ed8d8d99e.tar.gz postgresql-be6d1c88a4e6f563adac54483f3fc07ed8d8d99e.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.y | 2 | ||||
| -rw-r--r-- | src/include/parser/kwlist.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 154854f140b..9eb1bed58e6 100644 --- 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 9f6f6d354f3..ab883500377 100644 --- 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) |