commit 028cff2903f2498146c31a794c3edbc5bf24d6aa Author: kuroda.hayato%40jp.fujitsu.com Date: Tue Aug 10 07:48:04 2021 +0000 allow describe diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons index 1d38660fd7..94f7d4a3ec 100644 --- a/src/interfaces/ecpg/preproc/ecpg.addons +++ b/src/interfaces/ecpg/preproc/ecpg.addons @@ -132,13 +132,15 @@ ECPG: stmtViewStmt rule } | ECPGDescribe { - fprintf(base_yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1); + check_declared_list($1.stmt_name); + + fprintf(base_yyout, "{ ECPGdescribe(__LINE__, %d, %d, %s, %s,", compat, $1.input, connection ? connection : "NULL", $1.stmt_name); dump_variables(argsresult, 1); fputs("ECPGt_EORT);", base_yyout); fprintf(base_yyout, "}"); output_line_number(); - free($1); + free($1.stmt_name); } | ECPGDisconnect { diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 5263df2b6e..c7ba93575b 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -621,4 +621,5 @@ check_declared_list(const char *name) struct su_symbol struct_union; struct prep prep; struct exec exec; + struct describe describe; } diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 6bee9346a8..daf979a8e8 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -1111,41 +1111,33 @@ UsingConst: Iconst { $$ = $1; } */ ECPGDescribe: SQL_DESCRIBE INPUT_P prepared_name using_descriptor { - const char *con = connection ? connection : "NULL"; - mmerror(PARSE_ERROR, ET_WARNING, "using unsupported DESCRIBE statement"); - $$ = (char *) mm_alloc(sizeof("1, , ") + strlen(con) + strlen($3)); - sprintf($$, "1, %s, %s", con, $3); + $$.input = 1; + $$.stmt_name = $3; } | SQL_DESCRIBE opt_output prepared_name using_descriptor { - const char *con = connection ? connection : "NULL"; struct variable *var; - var = argsinsert->variable; remove_variable_from_list(&argsinsert, var); add_variable_to_head(&argsresult, var, &no_indicator); - $$ = (char *) mm_alloc(sizeof("0, , ") + strlen(con) + strlen($3)); - sprintf($$, "0, %s, %s", con, $3); + $$.input = 0; + $$.stmt_name = $3; } | SQL_DESCRIBE opt_output prepared_name into_descriptor { - const char *con = connection ? connection : "NULL"; - $$ = (char *) mm_alloc(sizeof("0, , ") + strlen(con) + strlen($3)); - sprintf($$, "0, %s, %s", con, $3); + $$.input = 0; + $$.stmt_name = $3; } | SQL_DESCRIBE INPUT_P prepared_name into_sqlda { - const char *con = connection ? connection : "NULL"; - mmerror(PARSE_ERROR, ET_WARNING, "using unsupported DESCRIBE statement"); - $$ = (char *) mm_alloc(sizeof("1, , ") + strlen(con) + strlen($3)); - sprintf($$, "1, %s, %s", con, $3); + $$.input = 1; + $$.stmt_name = $3; } | SQL_DESCRIBE opt_output prepared_name into_sqlda { - const char *con = connection ? connection : "NULL"; - $$ = (char *) mm_alloc(sizeof("0, , ") + strlen(con) + strlen($3)); - sprintf($$, "0, %s, %s", con, $3); + $$.input = 0; + $$.stmt_name = $3; } ; diff --git a/src/interfaces/ecpg/preproc/ecpg.type b/src/interfaces/ecpg/preproc/ecpg.type index e8c36119ed..e4b77fa065 100644 --- a/src/interfaces/ecpg/preproc/ecpg.type +++ b/src/interfaces/ecpg/preproc/ecpg.type @@ -10,7 +10,6 @@ %type ECPGDeclaration %type ECPGDeclare %type ECPGDeclareStmt -%type ECPGDescribe %type ECPGDisconnect %type ECPGExecuteImmediateStmt %type ECPGFree @@ -143,3 +142,5 @@ %type var_type %type action + +%type ECPGDescribe \ No newline at end of file diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h index 01ccb74fdc..fb20be53e0 100644 --- a/src/interfaces/ecpg/preproc/type.h +++ b/src/interfaces/ecpg/preproc/type.h @@ -207,4 +207,10 @@ struct fetch_desc char *name; }; +struct describe +{ + int input; + char *stmt_name; +}; + #endif /* _ECPG_PREPROC_TYPE_H */