database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

In ecpg's parser removed a fixed length limit for constants defining an array dimension.

Browse Source
This commit is contained in:
Michael Meskes 2011-01-08 18:35:37 +01:00
parent 7e2f906201
commit 833a2b57bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/ecpg/preproc/ecpg.trailer
View File

@ -840,7 +840,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initialize
struct ECPGtype * type; struct ECPGtype * type;
char *dimension = $3.index1; /* dimension of array */ char *dimension = $3.index1; /* dimension of array */
char *length = $3.index2; /* length of string */ char *length = $3.index2; /* length of string */
char dim[14L]; char *dim_str;
char *vcn; char *vcn;
adjust_array(actual_type[struct_level].type_enum, &dimension, &length, actual_type[struct_level].type_dimension, actual_type[struct_level].type_index, strlen($1), false); adjust_array(actual_type[struct_level].type_enum, &dimension, &length, actual_type[struct_level].type_dimension, actual_type[struct_level].type_index, strlen($1), false);
@ -864,9 +864,9 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initialize
type = ECPGmake_array_type(ECPGmake_simple_type(actual_type[struct_level].type_enum, length, varchar_counter), dimension); type = ECPGmake_array_type(ECPGmake_simple_type(actual_type[struct_level].type_enum, length, varchar_counter), dimension);
if (strcmp(dimension, "0") == 0 || abs(atoi(dimension)) == 1) if (strcmp(dimension, "0") == 0 || abs(atoi(dimension)) == 1)
*dim = '\0'; dim_str=make_str("");
else else
sprintf(dim, "[%s]", dimension); dim_str=cat_str(3, make_str("["), mm_strdup(dimension), make_str("]"));
/* cannot check for atoi <= 0 because a defined constant will yield 0 here as well */ /* cannot check for atoi <= 0 because a defined constant will yield 0 here as well */
if (atoi(length) < 0 || strcmp(length, "0") == 0) if (atoi(length) < 0 || strcmp(length, "0") == 0)
mmerror(PARSE_ERROR, ET_ERROR, "pointers to varchar are not implemented"); mmerror(PARSE_ERROR, ET_ERROR, "pointers to varchar are not implemented");
@ -877,7 +877,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initialize
if (strcmp(dimension, "0") == 0) if (strcmp(dimension, "0") == 0)
$$ = cat_str(7, make2_str(make_str(" struct varchar_"), vcn), make_str(" { int len; char arr["), mm_strdup(length), make_str("]; } *"), mm_strdup($2), $4, $5); $$ = cat_str(7, make2_str(make_str(" struct varchar_"), vcn), make_str(" { int len; char arr["), mm_strdup(length), make_str("]; } *"), mm_strdup($2), $4, $5);
else else
$$ = cat_str(8, make2_str(make_str(" struct varchar_"), vcn), make_str(" { int len; char arr["), mm_strdup(length), make_str("]; } "), mm_strdup($2), mm_strdup(dim), $4, $5); $$ = cat_str(8, make2_str(make_str(" struct varchar_"), vcn), make_str(" { int len; char arr["), mm_strdup(length), make_str("]; } "), mm_strdup($2), dim_str, $4, $5);
varchar_counter++; varchar_counter++;
break; break;

2
src/interfaces/ecpg/test/expected/preproc-array_of_struct.c
View File

@ -114,7 +114,7 @@ int main()
int r ; int r ;
#line 45 "array_of_struct.pgc" #line 45 "array_of_struct.pgc"
struct varchar_onlyname_5 { int len; char arr[ 50 ]; } onlyname [2] ; struct varchar_onlyname_5 { int len; char arr[ 50 ]; } onlyname [ 2 ] ;
/* exec sql end declare section */ /* exec sql end declare section */
#line 46 "array_of_struct.pgc" #line 46 "array_of_struct.pgc"