mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug#24736: UDF functions parsed as Stored Functions
Before this fix, a call to a User Defined Function (UDF) could, under some circumstances, be interpreted as a call to a Stored function instead. This occurred if a native function was invoked in the parameters for the UDF, as in "select my_udf(abs(x))". The root cause of this defect is the introduction, by the fix for Bug 21809, of st_select_lex::udf_list, and it's usage in the parser in sql_yacc.yy in the rule function_call_generic (in 5.1). While the fix itself for Bug 21809 is correct in 5.0, the code change merged into the 5.1 release created the issue, because the calls in 5.1 to : - lex->current_select->udf_list.push_front(udf) - lex->current_select->udf_list.pop() are not balanced in case of native functions, causing the udf_list, which is really a stack, to be out of sync with the internal stack maintained by the bison parser. Instead of moving the call to udf_list.pop(), which would have fixed the symptom, this patch goes further and removes the need for udf_list. This is motivated by two reasons: a) Maintaining a stack in the MySQL code in sync with the stack maintained internally in sql_yacc.cc (not .yy) is extremely dependent of the implementation of yacc/bison, and extremely difficult to maintain. It's also totally dependent of the structure of the grammar, and has a risk to break with regression defects each time the grammar itself is changed. b) The previous code did report construct like "foo(expr AS name)" as syntax errors (ER_PARSER_ERROR), which is incorrect, and misleading. The syntax is perfectly valid, as this expression is valid when "foo" is a UDF. Whether this syntax is legal or not depends of the semantic of "foo". With this change: a) There is only one stack (in bison), and no List<udf_func> to maintain. b) "foo(expr AS name)", when used incorrectly, is reported as semantic error: - ER_WRONG_PARAMETERS_TO_NATIVE_FCT (for native functions) - ER_WRONG_PARAMETERS_TO_STORED_FCT (for stored functions) This is achieved by the changes implemented in item_create.cc mysql-test/r/parser.result: New tests mysql-test/r/udf.result: New tests mysql-test/t/parser.test: New tests mysql-test/t/udf.test: New tests sql/item_create.cc: Semantic checks for named parameters, as in "foo(expr AS name)". sql/share/errmsg.txt: New error message sql/sql_lex.cc: Remove usage of udf_list. sql/sql_lex.h: Remove usage of udf_list. sql/sql_yacc.yy: Remove usage of udf_list.
This commit is contained in:
unknown
@ -386,3 +386,104 @@ select yearweek();
|
||||
ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'
|
||||
select yearweek(1, 2, 3);
|
||||
ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'
|
||||
select abs(3);
|
||||
abs(3)
|
||||
3
|
||||
select abs(3 AS three);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'abs'
|
||||
select abs(3 three);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'abs'
|
||||
select abs(3 AS "three");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'abs'
|
||||
select abs(3 "three");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'abs'
|
||||
set @bar="bar";
|
||||
set @foobar="foobar";
|
||||
select instr("foobar", "bar");
|
||||
instr("foobar", "bar")
|
||||
4
|
||||
select instr("foobar" AS p1, "bar");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar" p1, "bar");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar" AS "p1", "bar");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar" "p1", "bar");
|
||||
instr("foobar" "p1", "bar")
|
||||
4
|
||||
select instr(@foobar "p1", "bar");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar", "bar" AS p2);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar", "bar" p2);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar", "bar" AS "p2");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar", "bar" "p2");
|
||||
instr("foobar", "bar" "p2")
|
||||
0
|
||||
select instr("foobar", @bar "p2");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select instr("foobar" AS p1, "bar" AS p2);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'instr'
|
||||
select conv(255, 10, 16);
|
||||
conv(255, 10, 16)
|
||||
FF
|
||||
select conv(255 AS p1, 10, 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255 p1, 10, 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255 AS "p1", 10, 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255 "p1", 10, 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10 AS p2, 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10 p2, 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10 AS "p2", 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10 "p2", 16);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10, 16 AS p3);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10, 16 p3);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10, 16 AS "p3");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255, 10, 16 "p3");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select conv(255 AS p1, 10 AS p2, 16 AS p3);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'conv'
|
||||
select atan(10);
|
||||
atan(10)
|
||||
1.4711276743037
|
||||
select atan(10 AS p1);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 p1);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 AS "p1");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 "p1");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10, 20);
|
||||
atan(10, 20)
|
||||
0.46364760900081
|
||||
select atan(10 AS p1, 20);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 p1, 20);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 AS "p1", 20);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 "p1", 20);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10, 20 AS p2);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10, 20 p2);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10, 20 AS "p2");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10, 20 "p2");
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
select atan(10 AS p1, 20 AS p2);
|
||||
ERROR 42000: Incorrect parameters in the call to native function 'atan'
|
||||
|
||||
Reference in New Issue
Block a user