diff options
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 10 | ||||
| -rw-r--r-- | src/backend/parser/keywords.c | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 4597a5e4af0..0be936069f6 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.261 2001/10/09 22:32:32 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.262 2001/10/10 00:02:42 petere Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -315,8 +315,8 @@ static void doNegateFloat(Value *v); PARTIAL, POSITION, PRECISION, PRIMARY, PRIOR, PRIVILEGES, PROCEDURE, PUBLIC, READ, REFERENCES, RELATIVE, REVOKE, RIGHT, ROLLBACK, SCHEMA, SCROLL, SECOND_P, SELECT, SESSION, SESSION_USER, SET, SOME, SUBSTRING, - TABLE, TEMPORARY, THEN, TIME, TIMESTAMP, TIMEZONE_HOUR, - TIMEZONE_MINUTE, TO, TRAILING, TRANSACTION, TRIM, TRUE_P, + TABLE, TEMPORARY, THEN, TIME, TIMESTAMP, + TO, TRAILING, TRANSACTION, TRIM, TRUE_P, UNENCRYPTED, UNION, UNIQUE, UNKNOWN, UPDATE, USER, USING, VALUES, VARCHAR, VARYING, VIEW, WHEN, WHERE, WITH, WORK, YEAR_P, ZONE @@ -5200,8 +5200,6 @@ extract_list: extract_arg FROM a_expr extract_arg: datetime { $$ = $1; } | SCONST { $$ = $1; } | IDENT { $$ = $1; } - | TIMEZONE_HOUR { $$ = "tz_hour"; } - | TIMEZONE_MINUTE { $$ = "tz_minute"; } ; /* position_list uses b_expr not a_expr to avoid conflict with general IN */ @@ -5738,8 +5736,6 @@ TokenId: ABSOLUTE { $$ = "absolute"; } | TEMP { $$ = "temp"; } | TEMPLATE { $$ = "template"; } | TEMPORARY { $$ = "temporary"; } - | TIMEZONE_HOUR { $$ = "timezone_hour"; } - | TIMEZONE_MINUTE { $$ = "timezone_minute"; } | TOAST { $$ = "toast"; } | TRIGGER { $$ = "trigger"; } | TRUNCATE { $$ = "truncate"; } diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index 3beac5a6f4f..fad08c849f1 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.98 2001/10/02 21:39:35 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.99 2001/10/10 00:02:42 petere Exp $ * *------------------------------------------------------------------------- */ @@ -252,8 +252,6 @@ static ScanKeyword ScanKeywords[] = { {"then", THEN}, {"time", TIME}, {"timestamp", TIMESTAMP}, - {"timezone_hour", TIMEZONE_HOUR}, - {"timezone_minute", TIMEZONE_MINUTE}, {"to", TO}, {"toast", TOAST}, {"trailing", TRAILING}, |