postgres.git / summary / log / commit / refs

commit    b05c415c8115840f5340d65be0ca3dd437edd5bd
Author:   Michael Meskes <meskes@postgresql.org>
Date:     Tue Nov 26 16:12:39 2013 +0000
First released in: 9.4.0, 8.4.19, 9.0.15, 9.1.11, 9.2.6, 9.3.2

    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>


src/interfaces/ecpg/preproc/ecpg.trailer | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 8258ce2f7d3..43b954f0457 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -837,7 +837,12 @@ opt_signed: SQL_SIGNED variable_list: variable { $$ = $1; } | variable_list ',' variable - { $$ = cat_str(3, $1, mm_strdup(","), $3); } + { + if (actual_type[struct_level].type_enum == ECPGt_varchar) + $$ = cat_str(3, $1, mm_strdup(";"), $3); + else + $$ = cat_str(3, $1, mm_strdup(","), $3); + } ; variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initializer [parent: 0aec900bf0af]