mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the
(updated) Protocol_cursor class. Also did some bug fixes. Docs/sp-imp-spec.txt: Added CURSOR docs (and fixed typos) Docs/sp-implemented.txt: Updated for CURSORs include/mysqld_error.h: New error codes/messages for CURSORs libmysqld/Makefile.am: SP cursors now needs this. mysql-test/r/sp-error.result: New tests for cursors. mysql-test/r/sp.result: New tests for cursors. mysql-test/t/sp-error.test: New tests for cursors. mysql-test/t/sp.test: New tests for cursors. sql/protocol.cc: We now always have Protocol_cursor (SPs use it) sql/protocol.h: Fixed bugs in Protocol_cursor (for SPs) sql/protocol_cursor.cc: Fixed bugs in Protocol_cursor (for SPs) sql/share/czech/errmsg.txt: New error codes/messages for CURSORs sql/share/danish/errmsg.txt: New error codes/messages for CURSORs sql/share/dutch/errmsg.txt: New error codes/messages for CURSORs sql/share/english/errmsg.txt: New error codes/messages for CURSORs sql/share/estonian/errmsg.txt: New error codes/messages for CURSORs sql/share/french/errmsg.txt: New error codes/messages for CURSORs sql/share/german/errmsg.txt: New error codes/messages for CURSORs sql/share/greek/errmsg.txt: New error codes/messages for CURSORs sql/share/hungarian/errmsg.txt: New error codes/messages for CURSORs sql/share/italian/errmsg.txt: New error codes/messages for CURSORs sql/share/japanese/errmsg.txt: New error codes/messages for CURSORs sql/share/korean/errmsg.txt: New error codes/messages for CURSORs sql/share/norwegian-ny/errmsg.txt: New error codes/messages for CURSORs sql/share/norwegian/errmsg.txt: New error codes/messages for CURSORs sql/share/polish/errmsg.txt: New error codes/messages for CURSORs sql/share/portuguese/errmsg.txt: New error codes/messages for CURSORs sql/share/romanian/errmsg.txt: New error codes/messages for CURSORs sql/share/russian/errmsg.txt: New error codes/messages for CURSORs sql/share/serbian/errmsg.txt: New error codes/messages for CURSORs sql/share/slovak/errmsg.txt: New error codes/messages for CURSORs sql/share/spanish/errmsg.txt: New error codes/messages for CURSORs sql/share/swedish/errmsg.txt: New error codes/messages for CURSORs sql/share/ukrainian/errmsg.txt: New error codes/messages for CURSORs sql/sp_head.cc: Added cursor support. Also fixed problems with item_lists, where pointers and ref_pointer_arrays. sql/sp_head.h: Added cursor support sql/sp_pcontext.cc: Added cursor support sql/sp_pcontext.h: Added cursor support sql/sp_rcontext.cc: Added cursor support, in particular the new sp_cursor class. sql/sp_rcontext.h: Added cursor support, in particular the new sp_cursor class. sql/sql_lex.h: We sometimes need to copy item_lists in LEX when executing substatements in SPs sql/sql_yacc.yy: Added minimal cursor support (not the full syntax yet).
This commit is contained in:
unknown
@ -138,3 +138,85 @@ end;
|
||||
select f(10);
|
||||
ERROR HY000: FUNCTION f ended without RETURN
|
||||
drop function f;
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for insert into test.t1 values ("foo", 42);
|
||||
open c;
|
||||
close c;
|
||||
end;
|
||||
ERROR HY000: Cursor statement must be a SELECT
|
||||
create procedure p()
|
||||
begin
|
||||
declare x int;
|
||||
declare c cursor for select * into x from test.t limit 1;
|
||||
open c;
|
||||
close c;
|
||||
end;
|
||||
ERROR HY000: Cursor SELECT must not have INTO
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from test.t;
|
||||
open cc;
|
||||
close c;
|
||||
end;
|
||||
ERROR HY000: Undefined CURSOR: cc
|
||||
drop table if exists t1;
|
||||
create table t1 (val int);
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from test.t1;
|
||||
open c;
|
||||
open c;
|
||||
close c;
|
||||
end;
|
||||
call p();
|
||||
ERROR HY000: Cursor is already open
|
||||
drop procedure p;
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from test.t1;
|
||||
open c;
|
||||
close c;
|
||||
close c;
|
||||
end;
|
||||
call p();
|
||||
ERROR HY000: Cursor is not open
|
||||
drop procedure p;
|
||||
drop table t1;
|
||||
drop table if exists t1;
|
||||
create table t1 (val int, x float);
|
||||
insert into t1 values (42, 3.1), (19, 1.2);
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from t1;
|
||||
declare x int;
|
||||
open c;
|
||||
fetch c into x, y;
|
||||
close c;
|
||||
end;
|
||||
ERROR HY000: Undeclared variable: y
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from t1;
|
||||
declare x int;
|
||||
open c;
|
||||
fetch c into x;
|
||||
close c;
|
||||
end;
|
||||
call p();
|
||||
ERROR HY000: Wrong number of FETCH variables
|
||||
drop procedure p;
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from t1;
|
||||
declare x int;
|
||||
declare y float;
|
||||
declare z int;
|
||||
open c;
|
||||
fetch c into x, y, z;
|
||||
close c;
|
||||
end;
|
||||
call p();
|
||||
ERROR HY000: Wrong number of FETCH variables
|
||||
drop procedure p;
|
||||
drop table t1;
|
||||
|
||||
@ -500,6 +500,33 @@ id data
|
||||
hndlr3 13
|
||||
delete from t1;
|
||||
drop procedure hndlr3;
|
||||
create procedure cur1()
|
||||
begin
|
||||
declare done int default 0;
|
||||
declare continue handler for 1305 set done = 1;
|
||||
declare c cursor for select * from test.t2;
|
||||
declare a char(16);
|
||||
declare b int;
|
||||
declare c double;
|
||||
open c;
|
||||
repeat
|
||||
fetch c into a, b, c;
|
||||
if not done then
|
||||
insert into test.t1 values (a, b+c);
|
||||
end if;
|
||||
until done end repeat;
|
||||
close c;
|
||||
end;
|
||||
insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14);
|
||||
call cur1();
|
||||
select * from t1;
|
||||
id data
|
||||
foo 40
|
||||
bar 15
|
||||
zap 663
|
||||
delete from t1;
|
||||
delete from t2;
|
||||
drop procedure cur1;
|
||||
create procedure bug822(a_id char(16), a_data int)
|
||||
begin
|
||||
declare n int;
|
||||
|
||||
@ -194,4 +194,110 @@ select f(10)|
|
||||
|
||||
drop function f|
|
||||
|
||||
--error 1298
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for insert into test.t1 values ("foo", 42);
|
||||
|
||||
open c;
|
||||
close c;
|
||||
end|
|
||||
|
||||
--error 1299
|
||||
create procedure p()
|
||||
begin
|
||||
declare x int;
|
||||
declare c cursor for select * into x from test.t limit 1;
|
||||
|
||||
open c;
|
||||
close c;
|
||||
end|
|
||||
|
||||
--error 1300
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from test.t;
|
||||
|
||||
open cc;
|
||||
close c;
|
||||
end|
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1|
|
||||
--enable_warnings
|
||||
create table t1 (val int)|
|
||||
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from test.t1;
|
||||
|
||||
open c;
|
||||
open c;
|
||||
close c;
|
||||
end|
|
||||
--error 1301
|
||||
call p()|
|
||||
drop procedure p|
|
||||
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from test.t1;
|
||||
|
||||
open c;
|
||||
close c;
|
||||
close c;
|
||||
end|
|
||||
--error 1302
|
||||
call p()|
|
||||
drop procedure p|
|
||||
|
||||
drop table t1|
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1|
|
||||
--enable_warnings
|
||||
create table t1 (val int, x float)|
|
||||
insert into t1 values (42, 3.1), (19, 1.2)|
|
||||
|
||||
--error 1303
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from t1;
|
||||
declare x int;
|
||||
|
||||
open c;
|
||||
fetch c into x, y;
|
||||
close c;
|
||||
end|
|
||||
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from t1;
|
||||
declare x int;
|
||||
|
||||
open c;
|
||||
fetch c into x;
|
||||
close c;
|
||||
end|
|
||||
--error 1304
|
||||
call p()|
|
||||
drop procedure p|
|
||||
|
||||
create procedure p()
|
||||
begin
|
||||
declare c cursor for select * from t1;
|
||||
declare x int;
|
||||
declare y float;
|
||||
declare z int;
|
||||
|
||||
open c;
|
||||
fetch c into x, y, z;
|
||||
close c;
|
||||
end|
|
||||
--error 1304
|
||||
call p()|
|
||||
drop procedure p|
|
||||
|
||||
drop table t1|
|
||||
|
||||
delimiter ;|
|
||||
|
||||
@ -588,7 +588,38 @@ select * from t1|
|
||||
delete from t1|
|
||||
drop procedure hndlr3|
|
||||
|
||||
#
|
||||
# Cursors
|
||||
#
|
||||
create procedure cur1()
|
||||
begin
|
||||
declare done int default 0;
|
||||
declare continue handler for 1305 set done = 1;
|
||||
declare c cursor for select * from test.t2;
|
||||
declare a char(16);
|
||||
declare b int;
|
||||
declare c double;
|
||||
|
||||
open c;
|
||||
repeat
|
||||
fetch c into a, b, c;
|
||||
if not done then
|
||||
insert into test.t1 values (a, b+c);
|
||||
end if;
|
||||
until done end repeat;
|
||||
close c;
|
||||
end|
|
||||
|
||||
insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14)|
|
||||
call cur1()|
|
||||
select * from t1|
|
||||
delete from t1|
|
||||
delete from t2|
|
||||
drop procedure cur1|
|
||||
|
||||
#
|
||||
# BUG#822
|
||||
#
|
||||
create procedure bug822(a_id char(16), a_data int)
|
||||
begin
|
||||
declare n int;
|
||||
|
||||
Reference in New Issue
Block a user