Skip to content

Commit 5bffd42

Browse files
author
Michael Meskes
committed
ECPG: Make the preprocessor emit ';' if the variable type for a list of
variables is varchar. This fixes this test case: int main(void) { exec sql begin declare section; varchar a[50], b[50]; exec sql end declare section; return 0; } Since varchars are internally turned into custom structs and the type name is emitted for these variable declarations, the preprocessed code previously had: struct varchar_1 { ... } a _,_ struct varchar_2 { ... } b ; The comma in the generated C file was a syntax error. There are no regression test changes since it's not exercised. Patch by Boszormenyi Zoltan <zb@cybertec.at>
1 parent 20ada26 commit 5bffd42

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/interfaces/ecpg/preproc/ecpg.trailer

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,12 @@ opt_signed: SQL_SIGNED
832832
variable_list: variable
833833
{ $$ = $1; }
834834
| variable_list ',' variable
835-
{ $$ = cat_str(3, $1, mm_strdup(","), $3); }
835+
{
836+
if (actual_type[struct_level].type_enum == ECPGt_varchar)
837+
$$ = cat_str(3, $1, mm_strdup(";"), $3);
838+
else
839+
$$ = cat_str(3, $1, mm_strdup(","), $3);
840+
}
836841
;
837842

838843
variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initializer

0 commit comments

Comments
 (0)