From a8c003ea9d9a7caa413d50a05a3120d9ce22e83a Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Wed, 24 Dec 2003 22:05:06 +0000 Subject: [PATCH] Fixed segfault in parsing of EXEC SQL SELECT * FROM foo() AS TBL( c int, i int); --- src/interfaces/ecpg/preproc/preproc.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 9bd7e1a74af..aa583444ede 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.263.2.3 2003/12/17 15:31:51 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.263.2.4 2003/12/24 22:05:06 meskes Exp $ */ /* Copyright comment */ %{ @@ -3017,7 +3017,7 @@ table_ref: relation_expr | func_table AS '(' TableFuncElementList ')' { $$=cat_str(4, $1, make_str("as ("), $4, make_str(")")); } | func_table AS ColId '(' TableFuncElementList ')' - { $$=cat_str(6, $1, make_str("as"), $3, make_str("("), $5, make_str(")")); } + { $$=cat_str(6, $1, make_str("as"), $3, make_str("("), $5, make_str(")"));} | func_table ColId '(' TableFuncElementList ')' { $$=cat_str(5, $1, $2, make_str("("), $4, make_str(")")); } | select_with_parens @@ -3120,7 +3120,7 @@ where_clause: WHERE a_expr { $$ = cat2_str(make_str("where"), $2); } TableFuncElementList: TableFuncElement { $$ = $1; } | TableFuncElementList ',' TableFuncElement - { $$ = cat_str(3, $1, ',', $3); } + { $$ = cat_str(3, $1, make_str(","), $3); } ; TableFuncElement: ColId Typename { $$ = cat2_str($1, $2); }