mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-36047 Package body variables are not allowed as FETCH targets
It was not possible to use a package body variable as a fetch target: CREATE PACKAGE BODY pkg AS vc INT := 0; FUNCTION f1 RETURN INT AS CURSOR cur IS SELECT 1 AS c FROM DUAL; BEGIN OPEN cur; FETCH cur INTO vc; -- this returned "Undeclared variable: vc" error. CLOSE cur; RETURN vc; END; END; FETCH assumed that all fetch targets reside of the same sp_rcontext instance with the cursor. This patch fixes the problem. Now a cursor and its fetch target can reside in different sp_rcontext instances. Details: - Adding a helper class sp_rcontext_addr (a combination of Sp_rcontext_handler pointer and an offset in the rcontext) - Adding a new class sp_fetch_target deriving from sp_rcontext_addr. Fetch targets in "FETCH cur INTO target1, target2 ..." are now collected into this structure instead of sp_variable. sp_variable cannot be used any more to store fetch targets, because it does not have a pointer to Sp_rcontext_handler (it only has the current rcontext offset). - Removing members sp_instr_set members m_rcontext_handler and m_offset. Deriving sp_instr_set from sp_rcontext_addr instead. - Renaming sp_instr_cfetch member "List<sp_variable> m_varlist" to "List<sp_fetch_target> m_fetch_target_list". - Fixing LEX::sp_add_cfetch() to return the pointer to the created sp_fetch_target instance (instead of returning bool). This helps to make the grammar in sql_yacc.c simpler - Renaming LEX::sp_add_cfetch() to LEX::sp_add_instr_cfetch(), as `if(sp_add_cfetch())` changed its meaning to the opposite, to avoid automatic wrong merge from earlier versions. - Chaning the "List<sp_variable> *vars" parameter to sp_cursor::fetch to have the data type "List<sp_fetch_target> *". - Changing the data type of "List<sp_variable> &vars" in sp_cursor::Select_fetch_into_spvars::send_data_to_variable_list() to "List<sp_fetch_target> &". - Adding THD helper methods get_rcontext() and get_variable(). - Moving the code from sql_yacc.yy into a new LEX method LEX::make_fetch_target(). - Simplifying the grammar in sql_yacc.yy using the new LEX method. Changing the data type of the bison rule sp_fetch_list from "void" to "List<sp_fetch_target> *".
This commit is contained in:
@@ -294,8 +294,10 @@ class LEX_COLUMN;
|
||||
class sp_head;
|
||||
class sp_name;
|
||||
class sp_instr;
|
||||
class sp_instr_cfetch;
|
||||
class sp_pcontext;
|
||||
class sp_variable;
|
||||
class sp_fetch_target;
|
||||
class sp_expr_lex;
|
||||
class sp_assignment_lex;
|
||||
class partition_info;
|
||||
@@ -3994,6 +3996,7 @@ public:
|
||||
sp_pcontext *not_used_ctx;
|
||||
return find_variable(name, ¬_used_ctx, rh);
|
||||
}
|
||||
sp_fetch_target *make_fetch_target(THD *thd, const Lex_ident_sys_st &name);
|
||||
bool set_variable(const Lex_ident_sys_st *name, Item *item,
|
||||
const LEX_CSTRING &expr_str);
|
||||
bool set_variable(const Lex_ident_sys_st *name1,
|
||||
@@ -4611,7 +4614,7 @@ public:
|
||||
create_info.add(options);
|
||||
return check_create_options(create_info);
|
||||
}
|
||||
bool sp_add_cfetch(THD *thd, const LEX_CSTRING *name);
|
||||
sp_instr_cfetch *sp_add_instr_cfetch(THD *thd, const LEX_CSTRING *name);
|
||||
bool sp_add_agg_cfetch();
|
||||
|
||||
bool set_command_with_check(enum_sql_command command,
|
||||
|
Reference in New Issue
Block a user