Synced parser and keyword list.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 28aaca24e672ebf3b5e47c85d6defe2cd3e28fe5..06c0414e15f14416d20743eb23868c3a916c04ab 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2169,7 +2169,6 @@ Fr Feb 2 09:53:48 CET 2007
 Su Feb 11 16:09:31 CET 2007
 
        - Fixed multibyte handling as reported by <harada.toshi@oss.ntt.co.jp>.
-       - Set ecpg library version to 5.3.
 
 Th Mar 15 08:27:53 CET 2007
 
@@ -2208,4 +2207,9 @@ Mon, 11 Jun 2007 13:59:57 +0200
 
        - Fixed memory leak in descriptor code.
        - Made ecpg delete output file in case of an error.
+
+Tue, 12 Jun 2007 09:46:03 +0200
+
+       - Synced parser and keyword list.
+       - Set ecpg library version to 5.3.
        - Set ecpg version to 4.3.1.

diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 5974de2743c9fca59fb9d71f84bfa7c146fee54b..d63efb7c3eca1e83db4f3efdc72dbef0c2a17efe 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -33,7 +33,6 @@ static ScanKeyword ScanKeywords[] = {
        {"connect", SQL_CONNECT},
        {"continue", SQL_CONTINUE},
        {"count", SQL_COUNT},
-       {"current", SQL_CURRENT},
        {"data", SQL_DATA},
        {"datetime_interval_code", SQL_DATETIME_INTERVAL_CODE},
        {"datetime_interval_precision", SQL_DATETIME_INTERVAL_PRECISION},

diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index f2e327f9ddf01a56ff523ad14bcda3078d4e7a74..1ac42e10504359e3f6b83908acce04da9a2f7bf8 100644 (file)
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -99,6 +99,7 @@ static ScanKeyword ScanKeywords[] = {
        {"createuser", CREATEUSER},
        {"cross", CROSS},
        {"csv", CSV},
+       {"current", CURRENT_P},
        {"current_date", CURRENT_DATE},
        {"current_role", CURRENT_ROLE},
        {"current_time", CURRENT_TIME},

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index b494a409e042b8f558cee2049c02e0ca5a1356e5..8e66f6541b5cdf40c92fa8680f4349ae979d0f6e 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -351,7 +351,7 @@ add_additional_variables(char *name, bool insert)
 /* special embedded SQL token */
 %token SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK
                SQL_CALL SQL_CARDINALITY SQL_CONNECT
-               SQL_CONTINUE SQL_COUNT SQL_CURRENT SQL_DATA
+               SQL_CONTINUE SQL_COUNT SQL_DATA
                SQL_DATETIME_INTERVAL_CODE
                SQL_DATETIME_INTERVAL_PRECISION SQL_DESCRIBE
                SQL_DESCRIPTOR SQL_DISCONNECT SQL_FOUND
@@ -387,8 +387,8 @@ add_additional_variables(char *name, bool insert)
        CLUSTER COALESCE COLLATE COLUMN COMMENT COMMIT
        COMMITTED CONCURRENTLY CONNECTION CONSTRAINT CONSTRAINTS 
        CONTENT_P CONVERSION_P CONVERT COPY COST CREATE CREATEDB
-       CREATEROLE CREATEUSER CROSS CSV CURRENT_DATE CURRENT_ROLE CURRENT_TIME
-       CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE
+       CREATEROLE CREATEUSER CROSS CSV CURRENT_P CURRENT_DATE CURRENT_ROLE
+       CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE
 
        DATABASE DAY_P DEALLOCATE DEC DECIMAL_P DECLARE DEFAULT DEFAULTS
        DEFERRABLE DEFERRED DEFINER DELETE_P DELIMITER DELIMITERS
@@ -576,7 +576,7 @@ add_additional_variables(char *name, bool insert)
 %type  <str>   select_limit CheckPointStmt ECPGColId old_aggr_list
 %type  <str>   OptSchemaName OptSchemaEltList schema_stmt opt_drop_behavior
 %type  <str>   handler_name any_name_list any_name opt_as insert_column_list
-%type  <str>   columnref values_clause AllConstVar
+%type  <str>   columnref values_clause AllConstVar where_or_current_clause
 %type  <str>   insert_column_item DropRuleStmt ctext_expr 
 %type  <str>   createfunc_opt_item set_rest var_list_or_default alter_rel_cmd
 %type  <str>   CreateFunctionStmt createfunc_opt_list func_table
@@ -3274,7 +3274,7 @@ returning_clause:  RETURNING target_list  { $$ = cat2_str(make_str("returning"),
  *
  *****************************************************************************/
 
-DeleteStmt:  DELETE_P FROM relation_expr_opt_alias using_clause where_clause returning_clause
+DeleteStmt:  DELETE_P FROM relation_expr_opt_alias using_clause where_or_current_clause returning_clause
                        { $$ = cat_str(5, make_str("delete from"), $3, $4, $5, $6); }
                ;
 
@@ -3316,7 +3316,7 @@ opt_nowait:    NOWAIT                   { $$ = make_str("nowait"); }
 UpdateStmt:  UPDATE relation_expr_opt_alias
                                SET set_clause_list
                                from_clause
-                               where_clause
+                               where_or_current_clause
                                returning_clause
                        {$$ = cat_str(7, make_str("update"), $2, make_str("set"), $4, $5, $6, $7); }
                ;
@@ -3729,6 +3729,12 @@ where_clause:  WHERE a_expr              { $$ = cat2_str(make_str("where"), $2); }
                | /*EMPTY*/                             { $$ = EMPTY;  /* no qualifiers */ }
                ;
 
+where_or_current_clause:  WHERE a_expr                  { $$ = cat2_str(make_str("where"), $2); }
+                | WHERE CURRENT_P OF name               { $$ = cat2_str(make_str("where current of"), $4); }
+                | WHERE CURRENT_P OF PARAM              { $$ = make_str("where current of param"); }
+                | /*EMPTY*/                             { $$ = EMPTY;  /* no qualifiers */ }
+                ;
+
 TableFuncElementList: TableFuncElement
                        { $$ = $1; }
                | TableFuncElementList ',' TableFuncElement
@@ -5721,7 +5727,7 @@ ECPGDisconnect: SQL_DISCONNECT dis_name { $$ = $2; }
                ;
 
 dis_name: connection_object                    { $$ = $1; }
-               | SQL_CURRENT                   { $$ = make_str("\"CURRENT\""); }
+               | CURRENT_P                     { $$ = make_str("\"CURRENT\""); }
                | ALL                           { $$ = make_str("\"ALL\""); }
                | /* EMPTY */                   { $$ = make_str("\"CURRENT\""); }
                ;
@@ -6443,6 +6449,7 @@ ECPGunreserved_con:         ABORT_P                       { $$ = make_str("abort"); }
                | CREATEROLE            { $$ = make_str("createrole"); }
                | CREATEUSER            { $$ = make_str("createuser"); }
                | CSV                           { $$ = make_str("csv"); }
+               | CURRENT_P                     { $$ = make_str("current"); }
                | CURSOR                        { $$ = make_str("cursor"); }
                | CYCLE                         { $$ = make_str("cycle"); }
                | DATABASE                      { $$ = make_str("database"); }