diff options
| author | Michael Meskes <meskes@postgresql.org> | 2010-04-01 10:30:53 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2010-04-01 10:30:53 +0000 |
| commit | 1fbb06d2042d999d5cb188b814fb2e3bd82da96b (patch) | |
| tree | ce5917f010f70488ed318bc5ae395020ba016ba5 /src/interfaces/ecpg/preproc/descriptor.c | |
| parent | b2bddc2ff22f0c3d54671e43c67a2563deed7908 (diff) | |
| download | postgresql-1fbb06d2042d999d5cb188b814fb2e3bd82da96b.tar.gz postgresql-1fbb06d2042d999d5cb188b814fb2e3bd82da96b.zip | |
Zoltan beautified his hidden-variable-patch for ecpg. This also makes sure we get an error message instead of a warning if the variable have different types.
Diffstat (limited to 'src/interfaces/ecpg/preproc/descriptor.c')
| -rw-r--r-- | src/interfaces/ecpg/preproc/descriptor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index 5fae7cc668a..f1ef742cce2 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -1,7 +1,7 @@ /* * functions needed for descriptor handling * - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/descriptor.c,v 1.33 2010/04/01 08:41:01 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/descriptor.c,v 1.34 2010/04/01 10:30:53 meskes Exp $ * * since descriptor might be either a string constant or a string var * we need to check for a constant if we expect a constant @@ -188,7 +188,7 @@ output_get_descr(char *desc_name, char *index) break; } fprintf(yyout, "%s,", get_dtype(results->value)); - ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL, make_str("0"), NULL, NULL, v->brace_level, -1); + ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, make_str("0"), NULL, NULL); } drop_assignments(); fputs("ECPGd_EODT);\n", yyout); @@ -293,7 +293,7 @@ output_set_descr(char *desc_name, char *index) case ECPGd_length: case ECPGd_type: fprintf(yyout, "%s,", get_dtype(results->value)); - ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL, make_str("0"), NULL, NULL, v->brace_level, -1); + ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, make_str("0"), NULL, NULL); break; default: |