mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
6b2f13098a
according to the standard. The idea is to use Field-classes to implement stored routines variables. Also, we should provide facade to Item-hierarchy by Item_field class (it is necessary, since SRVs take part in expressions). The patch fixes the following bugs: - BUG#8702: Stored Procedures: No Error/Warning shown for inappropriate data type matching; - BUG#8768: Functions: For any unsigned data type, -ve values can be passed and returned; - BUG#8769: Functions: For Int datatypes, out of range values can be passed and returned; - BUG#9078: STORED PROCDURE: Decimal digits are not displayed when we use DECIMAL datatype; - BUG#9572: Stored procedures: variable type declarations ignored; - BUG#12903: upper function does not work inside a function; - BUG#13705: parameters to stored procedures are not verified; - BUG#13808: ENUM type stored procedure parameter accepts non-enumerated data; - BUG#13909: Varchar Stored Procedure Parameter always BINARY string (ignores CHARACTER SET); - BUG#14161: Stored procedure cannot retrieve bigint unsigned; - BUG#14188: BINARY variables have no 0x00 padding; - BUG#15148: Stored procedure variables accept non-scalar values; mysql-test/r/ctype_ujis.result: Explicitly specify correct charset. mysql-test/r/schema.result: Drop our test database to not affect this test if some test left it cause of failure. mysql-test/r/show_check.result: Drop our test database to not affect this test if some test left it cause of failure. mysql-test/r/skip_name_resolve.result: Ignore columns with unpredictable values. mysql-test/r/sp-big.result: Add cleanup statement. mysql-test/r/sp-dynamic.result: Add cleanup statements. mysql-test/r/sp.result: Update result file. mysql-test/r/sum_distinct-big.result: Update result file. mysql-test/r/type_newdecimal-big.result: Update result file. mysql-test/t/ctype_ujis.test: Explicitly specify correct charset. mysql-test/t/schema.test: Drop our test database to not affect this test if some test left it cause of failure. mysql-test/t/show_check.test: Drop our test database to not affect this test if some test left it cause of failure. mysql-test/t/skip_name_resolve.test: Ignore columns with unpredictable values. mysql-test/t/sp-big.test: Add cleanup statement. mysql-test/t/sp-dynamic.test: Add cleanup statements. mysql-test/t/sp.test: Non-scalar values prohibited for assignment to SP-vars; polishing. mysql-test/t/type_newdecimal-big.test: Update type specification so that the variables can contain the large values used in the test. sql/field.cc: Extract create_field::init() to initialize an existing instance of create_field from new_create_field(). sql/field.h: Extract create_field::init() to initialize an existing instance of create_field from new_create_field(). sql/item.cc: - Introduce a new class: Item_sp_variable -- a base class of stored-routine-variables classes; - Introduce Item_case_expr -- an Item, which is used to access to the expression of CASE statement; sql/item.h: - Introduce a new class: Item_sp_variable -- a base class of stored-routine-variables classes; - Introduce Item_case_expr -- an Item, which is used to access to the expression of CASE statement; sql/item_func.cc: Pass the Field (instead of Item) for the return value of a function to the function execution routine. sql/item_func.h: Pass the Field (instead of Item) for the return value of a function to the function execution routine. sql/mysql_priv.h: Move create_virtual_tmp_table() out of sql_select.h. sql/sp.cc: Use create_result_field() instead of make_field(). sql/sp_head.cc: - Add a function to map enum_field_types to Item::Type; - Add sp_instr_push_case_expr instruction -- an instruction to push CASE expression into the active running context; - Add sp_instr_pop_case_expr instruction -- an instruction to pop CASE expression from the active running context; - Adapt the SP-execution code to using Fields instead of Items for SP-vars; - Use create_field structure for field description instead of a set of members. sql/sp_head.h: - Add a function to map enum_field_types to Item::Type; - Add sp_instr_push_case_expr instruction -- an instruction to push CASE expression into the active running context; - Add sp_instr_pop_case_expr instruction -- an instruction to pop CASE expression from the active running context; - Adapt the SP-execution code to using Fields instead of Items for SP-vars; - Use create_field structure for field description instead of a set of members. sql/sp_pcontext.cc: - Change rules to assign an index of SP-variable: use transparent index; - Add an operation to retrieve a list of defined SP-vars from the processing context recursively. sql/sp_pcontext.h: - Change rules to assign an index of SP-variable: use transparent index; - Add an operation to retrieve a list of defined SP-vars from the processing context recursively. sql/sp_rcontext.cc: - Change rules to assign an index of SP-variable: use transparent index; - Use a tmp virtual table to store SP-vars instead of Items; - Provide operations to work with CASE expresion. sql/sp_rcontext.h: - Change rules to assign an index of SP-variable: use transparent index; - Use a tmp virtual table to store SP-vars instead of Items; - Provide operations to work with CASE expresion. sql/sql_class.cc: - Reflect Item_splocal ctor changes; - Item_splocal::get_offset() has been renamed to get_var_idx(). sql/sql_class.h: Polishing. sql/sql_parse.cc: Extract create_field::init() to initialize an existing instance of create_field from new_create_field(). sql/sql_select.cc: Take care of BLOB columns in create_virtual_tmp_table(). sql/sql_select.h: Move create_virtual_tmp_table() out of sql_select.h. sql/sql_trigger.cc: Use boolean constants for boolean type instead of numerical ones. sql/sql_yacc.yy: Provide an instance of create_field for each SP-var. mysql-test/include/sp-vars.inc: The definitions of common-procedures, which are created under different circumstances. mysql-test/r/sp-vars.result: Result file for the SP-vars test. mysql-test/sp-vars.test: A new test for checking SP-vars functionality.
385 lines
7.4 KiB
C++
385 lines
7.4 KiB
C++
/* -*- C++ -*- */
|
|
/* Copyright (C) 2002 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef _SP_PCONTEXT_H_
|
|
#define _SP_PCONTEXT_H_
|
|
|
|
#ifdef USE_PRAGMA_INTERFACE
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
typedef enum
|
|
{
|
|
sp_param_in,
|
|
sp_param_out,
|
|
sp_param_inout
|
|
} sp_param_mode_t;
|
|
|
|
typedef struct sp_pvar
|
|
{
|
|
LEX_STRING name;
|
|
enum enum_field_types type;
|
|
sp_param_mode_t mode;
|
|
|
|
/*
|
|
offset -- basically, this is an index of variable in the scope of root
|
|
parsing context. This means, that all variables in a stored routine
|
|
have distinct indexes/offsets.
|
|
*/
|
|
uint offset;
|
|
|
|
Item *dflt;
|
|
create_field field_def;
|
|
} sp_pvar_t;
|
|
|
|
|
|
#define SP_LAB_REF 0 // Unresolved reference (for goto)
|
|
#define SP_LAB_GOTO 1 // Free goto label
|
|
#define SP_LAB_BEGIN 2 // Label at BEGIN
|
|
#define SP_LAB_ITER 3 // Label at iteration control
|
|
|
|
typedef struct sp_label
|
|
{
|
|
char *name;
|
|
uint ip; // Instruction index
|
|
int type; // begin/iter or ref/free
|
|
sp_pcontext *ctx; // The label's context
|
|
} sp_label_t;
|
|
|
|
typedef struct sp_cond_type
|
|
{
|
|
enum { number, state, warning, notfound, exception } type;
|
|
char sqlstate[6];
|
|
uint mysqlerr;
|
|
} sp_cond_type_t;
|
|
|
|
/* Sanity check for SQLSTATEs. Will not check if it's really an existing
|
|
* state (there are just too many), but will check length bad characters.
|
|
*/
|
|
extern bool
|
|
sp_cond_check(LEX_STRING *sqlstate);
|
|
|
|
typedef struct sp_cond
|
|
{
|
|
LEX_STRING name;
|
|
sp_cond_type_t *val;
|
|
} sp_cond_t;
|
|
|
|
|
|
/*
|
|
This seems to be an "SP parsing context" or something.
|
|
*/
|
|
|
|
class sp_pcontext : public Sql_alloc
|
|
{
|
|
sp_pcontext(const sp_pcontext &); /* Prevent use of these */
|
|
void operator=(sp_pcontext &);
|
|
|
|
public:
|
|
|
|
sp_pcontext(sp_pcontext *prev);
|
|
|
|
// Free memory
|
|
void
|
|
destroy();
|
|
|
|
sp_pcontext *
|
|
push_context();
|
|
|
|
// Returns the previous context, not the one we pop
|
|
sp_pcontext *
|
|
pop_context();
|
|
|
|
sp_pcontext *
|
|
parent_context()
|
|
{
|
|
return m_parent;
|
|
}
|
|
|
|
uint
|
|
diff_handlers(sp_pcontext *ctx);
|
|
|
|
uint
|
|
diff_cursors(sp_pcontext *ctx);
|
|
|
|
|
|
//
|
|
// Parameters and variables
|
|
//
|
|
|
|
inline uint
|
|
total_pvars()
|
|
{
|
|
return m_total_pvars;
|
|
}
|
|
|
|
inline uint
|
|
current_pvars()
|
|
{
|
|
return m_poffset + m_pvar.elements;
|
|
}
|
|
|
|
inline uint
|
|
context_pvars()
|
|
{
|
|
return m_pvar.elements;
|
|
}
|
|
|
|
inline uint
|
|
pvar_context2index(uint i)
|
|
{
|
|
return m_poffset + i;
|
|
}
|
|
|
|
inline void
|
|
set_type(uint i, enum enum_field_types type)
|
|
{
|
|
sp_pvar_t *p= find_pvar(i);
|
|
|
|
if (p)
|
|
p->type= type;
|
|
}
|
|
|
|
inline void
|
|
set_default(uint i, Item *it)
|
|
{
|
|
sp_pvar_t *p= find_pvar(i);
|
|
|
|
if (p)
|
|
p->dflt= it;
|
|
}
|
|
|
|
sp_pvar_t *
|
|
push_pvar(LEX_STRING *name, enum enum_field_types type, sp_param_mode_t mode);
|
|
|
|
/*
|
|
Retrieve definitions of fields from the current context and its
|
|
children.
|
|
*/
|
|
void
|
|
retrieve_field_definitions(List<create_field> *field_def_lst);
|
|
|
|
// Find by name
|
|
sp_pvar_t *
|
|
find_pvar(LEX_STRING *name, my_bool scoped=0);
|
|
|
|
// Find by offset
|
|
sp_pvar_t *
|
|
find_pvar(uint offset);
|
|
|
|
/*
|
|
Set the current scope boundary (for default values).
|
|
The argument is the number of variables to skip.
|
|
*/
|
|
inline void
|
|
declare_var_boundary(uint n)
|
|
{
|
|
m_pboundary= n;
|
|
}
|
|
|
|
/*
|
|
CASE expressions support.
|
|
*/
|
|
|
|
inline int
|
|
register_case_expr()
|
|
{
|
|
return m_num_case_exprs++;
|
|
}
|
|
|
|
inline int
|
|
get_num_case_exprs() const
|
|
{
|
|
return m_num_case_exprs;
|
|
}
|
|
|
|
inline bool
|
|
push_case_expr_id(int case_expr_id)
|
|
{
|
|
return insert_dynamic(&m_case_expr_id_lst, (gptr) &case_expr_id);
|
|
}
|
|
|
|
inline void
|
|
pop_case_expr_id()
|
|
{
|
|
pop_dynamic(&m_case_expr_id_lst);
|
|
}
|
|
|
|
inline int
|
|
get_current_case_expr_id() const
|
|
{
|
|
int case_expr_id;
|
|
|
|
get_dynamic((DYNAMIC_ARRAY*)&m_case_expr_id_lst, (gptr) &case_expr_id,
|
|
m_case_expr_id_lst.elements - 1);
|
|
|
|
return case_expr_id;
|
|
}
|
|
|
|
//
|
|
// Labels
|
|
//
|
|
|
|
sp_label_t *
|
|
push_label(char *name, uint ip);
|
|
|
|
sp_label_t *
|
|
find_label(char *name);
|
|
|
|
inline sp_label_t *
|
|
last_label()
|
|
{
|
|
sp_label_t *lab= m_label.head();
|
|
|
|
if (!lab && m_parent)
|
|
lab= m_parent->last_label();
|
|
return lab;
|
|
}
|
|
|
|
inline sp_label_t *
|
|
pop_label()
|
|
{
|
|
return m_label.pop();
|
|
}
|
|
|
|
//
|
|
// Conditions
|
|
//
|
|
|
|
void
|
|
push_cond(LEX_STRING *name, sp_cond_type_t *val);
|
|
|
|
inline void
|
|
pop_cond(uint num)
|
|
{
|
|
while (num--)
|
|
pop_dynamic(&m_cond);
|
|
}
|
|
|
|
sp_cond_type_t *
|
|
find_cond(LEX_STRING *name, my_bool scoped=0);
|
|
|
|
//
|
|
// Handlers
|
|
//
|
|
|
|
inline void
|
|
push_handler(sp_cond_type_t *cond)
|
|
{
|
|
insert_dynamic(&m_handler, (gptr)&cond);
|
|
}
|
|
|
|
bool
|
|
find_handler(sp_cond_type *cond);
|
|
|
|
inline uint
|
|
max_handlers()
|
|
{
|
|
return m_hsubsize + m_handlers;
|
|
}
|
|
|
|
inline void
|
|
add_handlers(uint n)
|
|
{
|
|
m_handlers+= n;
|
|
}
|
|
|
|
//
|
|
// Cursors
|
|
//
|
|
|
|
void
|
|
push_cursor(LEX_STRING *name);
|
|
|
|
my_bool
|
|
find_cursor(LEX_STRING *name, uint *poff, my_bool scoped=0);
|
|
|
|
/* Find by offset (for debugging only) */
|
|
my_bool
|
|
find_cursor(uint offset, LEX_STRING *n);
|
|
|
|
inline uint
|
|
max_cursors()
|
|
{
|
|
return m_csubsize + m_cursor.elements;
|
|
}
|
|
|
|
inline uint
|
|
current_cursors()
|
|
{
|
|
return m_coffset + m_cursor.elements;
|
|
}
|
|
|
|
protected:
|
|
|
|
/*
|
|
m_total_pvars -- number of variables (including all types of arguments)
|
|
in this context including all children contexts.
|
|
|
|
m_total_pvars >= m_pvar.elements.
|
|
|
|
m_total_pvars of the root parsing context contains number of all
|
|
variables (including arguments) in all enclosed contexts.
|
|
*/
|
|
uint m_total_pvars;
|
|
|
|
// The maximum sub context's framesizes
|
|
uint m_csubsize;
|
|
uint m_hsubsize;
|
|
uint m_handlers; // No. of handlers in this context
|
|
|
|
private:
|
|
|
|
sp_pcontext *m_parent; // Parent context
|
|
|
|
/*
|
|
m_poffset -- basically, this is an index of the first variable in this
|
|
parsing context.
|
|
|
|
m_poffset is 0 for root context.
|
|
|
|
Since now each variable is stored in separate place, no reuse is done,
|
|
so m_poffset is different for all enclosed contexts.
|
|
*/
|
|
uint m_poffset;
|
|
|
|
uint m_coffset; // Cursor offset for this context
|
|
|
|
/*
|
|
Boundary for finding variables in this context. This is the number
|
|
of variables currently "invisible" to default clauses.
|
|
This is normally 0, but will be larger during parsing of
|
|
DECLARE ... DEFAULT, to get the scope right for DEFAULT values.
|
|
*/
|
|
uint m_pboundary;
|
|
|
|
int m_num_case_exprs;
|
|
|
|
DYNAMIC_ARRAY m_pvar; // Parameters/variables
|
|
DYNAMIC_ARRAY m_case_expr_id_lst; /* Stack of CASE expression ids. */
|
|
DYNAMIC_ARRAY m_cond; // Conditions
|
|
DYNAMIC_ARRAY m_cursor; // Cursors
|
|
DYNAMIC_ARRAY m_handler; // Handlers, for checking of duplicates
|
|
|
|
List<sp_label_t> m_label; // The label list
|
|
|
|
List<sp_pcontext> m_children; // Children contexts, used for destruction
|
|
|
|
}; // class sp_pcontext : public Sql_alloc
|
|
|
|
|
|
#endif /* _SP_PCONTEXT_H_ */
|