Synced parser and keyword list.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 3be4f39e14de7c1c2bf990ecff642f3822dc6d45..500dbb4931a5d8412da108adcbee38746831c4cb 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2260,6 +2260,10 @@ Wed, 03 Oct 2007 10:48:39 +0200
          exported.
        - Created export list for ecpglib.
        - 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 compat library version to 3.0.
        - Set ecpg library version to 6.0.

diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 09e0bb88658a2a14801dcbe870d324bcbed8a7d5..b23cedb1d03c25cad9cf99771c225b29793b6c09 100644 (file)
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -92,7 +92,6 @@ static const ScanKeyword ScanPGSQLKeywords[] = {
        {"constraints", CONSTRAINTS},
        {"content", CONTENT_P},
        {"conversion", CONVERSION_P},
-       {"convert", CONVERT},
        {"copy", COPY},
        {"cost", COST},
        {"create", CREATE},

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index be7bcfb9a0a7858e25bd42dd7a1357b5461ce712..0c6c58f416d96d6983f55da6b9573e91658a9c34 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -422,7 +422,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
        CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE
        CLUSTER COALESCE COLLATE COLUMN COMMENT COMMIT
        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
        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(")")); }
                | TRIM '(' trim_list ')'
                        { $$ = 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 ')'
                        { $$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")")); }
                | COALESCE '(' expr_list ')'
@@ -6652,7 +6648,6 @@ col_name_keyword:
  */
                | CHARACTER             { $$ = make_str("character"); }
                | COALESCE              { $$ = make_str("coalesce"); }
-               | CONVERT               { $$ = make_str("convert"); }
                | DEC                   { $$ = make_str("dec"); }
                | DECIMAL_P             { $$ = make_str("decimal"); }
                | EXISTS                { $$ = make_str("exists"); }