rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Synced parser and keyword list.

This commit is contained in:
Michael Meskes 2007-10-10 06:33:17 +00:00
parent e1caa90406
commit ea82ad6aff
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/ChangeLog
View File

@ -2260,6 +2260,10 @@ Wed, 03 Oct 2007 10:48:39 +0200
exported. exported.
- Created export list for ecpglib. - Created export list for ecpglib.
- Also created export list for pgytpeslib and compatlib. - Also created export list for pgytpeslib and compatlib.
Wed, 10 Oct 2007 08:31:44 +0200
- Synced parser and keyword list.
- Set pgtypes library version to 3.0. - Set pgtypes library version to 3.0.
- Set compat library version to 3.0. - Set compat library version to 3.0.
- Set ecpg library version to 6.0. - Set ecpg library version to 6.0.

3
src/interfaces/ecpg/preproc/keywords.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.82 2007/09/04 10:02:29 meskes Exp $ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.83 2007/10/10 06:33:17 meskes Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -92,7 +92,6 @@ static const ScanKeyword ScanPGSQLKeywords[] = {
{"constraints", CONSTRAINTS}, {"constraints", CONSTRAINTS},
{"content", CONTENT_P}, {"content", CONTENT_P},
{"conversion", CONVERSION_P}, {"conversion", CONVERSION_P},
{"convert", CONVERT},
{"copy", COPY}, {"copy", COPY},
{"cost", COST}, {"cost", COST},
{"create", CREATE}, {"create", CREATE},

9
src/interfaces/ecpg/preproc/preproc.y
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.353 2007/10/03 11:11:12 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.354 2007/10/10 06:33:17 meskes Exp $ */
/* Copyright comment */ /* Copyright comment */
%{ %{
@ -422,7 +422,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE
CLUSTER COALESCE COLLATE COLUMN COMMENT COMMIT CLUSTER COALESCE COLLATE COLUMN COMMENT COMMIT
COMMITTED CONCURRENTLY CONFIGURATION CONNECTION CONSTRAINT CONSTRAINTS COMMITTED CONCURRENTLY CONFIGURATION CONNECTION CONSTRAINT CONSTRAINTS
CONTENT_P CONVERSION_P CONVERT COPY COST CREATE CREATEDB CONTENT_P CONVERSION_P COPY COST CREATE CREATEDB
CREATEROLE CREATEUSER CROSS CSV CURRENT_P CURRENT_DATE CURRENT_ROLE CREATEROLE CREATEUSER CROSS CSV CURRENT_P CURRENT_DATE CURRENT_ROLE
CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE
@ -4405,10 +4405,6 @@ func_expr: func_name '(' ')'
{ $$ = cat_str(3, make_str("trim(trailing"), $4, make_str(")")); } { $$ = cat_str(3, make_str("trim(trailing"), $4, make_str(")")); }
| TRIM '(' trim_list ')' | TRIM '(' trim_list ')'
{ $$ = cat_str(3, make_str("trim("), $3, make_str(")")); } { $$ = cat_str(3, make_str("trim("), $3, make_str(")")); }
| CONVERT '(' a_expr USING any_name ')'
{ $$ = cat_str(5, make_str("convert("), $3, make_str("using"), $5, make_str(")"));}
| CONVERT '(' expr_list ')'
{ $$ = cat_str(3, make_str("convert("), $3, make_str(")")); }
| NULLIF '(' a_expr ',' a_expr ')' | NULLIF '(' a_expr ',' a_expr ')'
{ $$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")")); } { $$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")")); }
| COALESCE '(' expr_list ')' | COALESCE '(' expr_list ')'
@ -6652,7 +6648,6 @@ col_name_keyword:
*/ */
| CHARACTER { $$ = make_str("character"); } | CHARACTER { $$ = make_str("character"); }
| COALESCE { $$ = make_str("coalesce"); } | COALESCE { $$ = make_str("coalesce"); }
| CONVERT { $$ = make_str("convert"); }
| DEC { $$ = make_str("dec"); } | DEC { $$ = make_str("dec"); }
| DECIMAL_P { $$ = make_str("decimal"); } | DECIMAL_P { $$ = make_str("decimal"); }
| EXISTS { $$ = make_str("exists"); } | EXISTS { $$ = make_str("exists"); }