diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/ChangeLog | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index 500dbb4931a..6753f8edb68 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -2264,6 +2264,10 @@ Wed, 03 Oct 2007 10:48:39 +0200 Wed, 10 Oct 2007 08:31:44 +0200 - Synced parser and keyword list. + +Tue, 06 Nov 2007 09:29:22 +0100 + + - Fixed two parser bugs. - 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/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 985b40d1797..90d66deff3f 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.354 2007/10/10 06:33:17 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.355 2007/11/06 08:32:08 meskes Exp $ */ /* Copyright comment */ %{ @@ -2024,6 +2024,10 @@ ConstraintAttributeSpec: ConstraintDeferrabilitySpec { $$ = $1; } $$ = cat2_str($1, $2); } + | /* EMPTY */ + { + $$ = EMPTY; + } ; ConstraintDeferrabilitySpec: NOT DEFERRABLE @@ -3413,7 +3417,7 @@ DeleteStmt: DELETE_P FROM relation_expr_opt_alias using_clause where_or_current { $$ = cat_str(5, make_str("delete from"), $3, $4, $5, $6); } ; -using_clause: USING from_list { cat2_str(make_str("using"), $2); } +using_clause: USING from_list { $$ = cat2_str(make_str("using"), $2); } | /* EMPTY */ { $$ = EMPTY; } ; @@ -3757,7 +3761,7 @@ table_ref: relation_expr | func_table { $$ = $1; } | func_table alias_clause - { $$= cat2_str($1, $2); } + { $$= cat2_str($1, $2); } | func_table AS '(' TableFuncElementList ')' { $$=cat_str(4, $1, make_str("as ("), $4, make_str(")")); } | func_table AS ColId '(' TableFuncElementList ')' |