mirror of
https://github.com/MariaDB/server.git
synced 2026-03-09 01:48:42 +01:00
d8fc19495c
This change adds CURSOR declarations inside PACKAGE BODY.
PL/SQL mode:
SET sql_mode=ORACLE;
CREATE PACKAGE BODY pkg AS
CURSOR mc0 IS SELECT c0, c1 FROM t1;
PROCEDURE p1 AS
rec mc0%ROWTYPE;
BEGIN
OPEN mc0;
FETCH mc0 INTO rec;
CLOSE mc0
END;
END;
/
SQL/PSM mode:
SET sql_mode=DEFAULT;
CREATE PACKAGE BODY pkg
mc0 CURSOR FOR SELECT c0, c1 FROM t1;
PROCEDURE p1()
BEGIN
DECLARE rec ROW TYPE OF mc0;
OPEN mc0;
FETCH mc0 INTO rec;
CLOSE mc0
END;
END;
/
PACKAGE BODY cursors like local cursors
(declared inside a FUNCTION or a PROCEDURE) support:
- OPEN/FETCH/CLOSE
- FOR rec IN cur - an explicit cursor loop
- Using a cursor row as an anchored variable data type:
* DECLARE var cur%ROWTYPE; -- sql_mode=ORACLE
* DECLARE var ROW TYPE OF cur; -- sql_mode=DEFAULT
The patch details:
- Changing various class members and function/method parameters which
store a CURSOR run-time address from "uint" to sp_rcontext_addr.
A few classes now derive from sp_rcontext_addr instead of having
a "uint m_cursor;" member.
This change uses the same idea with what we did for SP variables,
when we implemented PACKAGE BODY variables a few years ago.
- Fixing the grammar in sql_yacc.yy to allow CURSOR declarations
inside PACKAGE BODY.
- Adding a new class sp_pcontext_top. It's used for the top level parse
context (of an sp_head). Note, its children contexts still use the old
class sp_pcontext.
sp_pcontext_top context additionally to sp_pcontext has:
const sp_head *m_sp; -- The pointer to the sp_head owning this context
Dynamic_array<sp_pcursor> m_member_cursors; -- PACKAGE BODY wide cursors
m_sp->m_parent->get_parse_context() is used to find the sp_pcontext
belonging to the parent PACKAGE BODY from a sp_pcontext_top instance
belonging to a PROCEDURE/FUNCTION sp_pcontext_top.
- Adding a new member in sp_rcontext:
Dynamic_array<sp_cursor*> m_member_cursors;
It's used to store run-time data of PACKAGE BODY wide cursors.
- Adding a new class sp_instr_copen2. It's used to open PACKAGE BODY cursors.
Unlike the usual cursors, PACKAGE BODY cursors:
* do not use the cursor stack (sp_rcontext::m_cstack)
* do not need a preceeding sp_instr_cpush
* do not need a following sp_instr_cpop
All cursor information such as "sp_lex_cursor" resides inside
sp_instr_copen2 itself (rather than inside sp_instr_cpush which is
used to store "sp_lex_cursor" in case of sp_instr_copen).
Note, the other cursor related instructions:
sp_instr_cfetch
sp_instr_cclose
sp_instr_cursor_copy_struct
do not need sp_instr_xxx2 counter-parts.
Thy just use sp_rcontext_addr to address cursors.
- Adding Sp_rcontext_handler_member
It's used to handle PACKAGE BODY members:
cursors and variables declared in the PACKAGE BODY,
when they are accessed from its executable initialization section:
CREATE PACKAGE BODY pkg AS
CURSOR mc0 IS SELECT c0, c1 FROM t1; -- A member (PACKAGE BODY cursor)
mv0 mc0%ROWTYPE; -- A member (PACKAGE BODY variable)
PROCEDURE p1 AS
BEGIN
-- Accessing members from here use sp_rcontext_handler_package_body
-- (members of the parent PACKAGE BODY)
OPEN mc0;
FETCH mc0 INTO mv0;
CLOSE mc0;
END;
BEGIN
-- NEW:
-- Accessing members from here use sp_rcontext_handler_member
-- (PACKAGE BODY own members)
OPEN mc0;
FETCH mc0 INTO mv0;
CLOSE mc0;
END;
/
Member variables and cursor are now marked with the "MEMBER." prefix
in the "SHOW PACKAGE BODY code" output.
Some old MTR tests have been re-recorded accordingly.
- Adding new virtual methods into Sp_rcontext_handler:
virtual const sp_variable *get_pvariable(const sp_pcontext *pctx,
uint offset) const;
virtual const sp_pcursor *get_pcursor(const sp_pcontext *pctx,
uint offset) const;
They're used from sp_instr::print() virtual implementations.
They internally calculate a proper sp_pcontext using as a parameter
the sp_pcontext pointed by sp_instr::m_ctx.
For example, Sp_handler_package_body::get_pvariable()/get_pcursor()
accesses to this sp_pcontext:
m_ctx->top_context()->m_sp->m_parent->get_parse_context(),
i.e. the parse context of the PACKAGE BODY which is the parent for
the current package PROCEDURE of FUNCTION an sp_instr belongs to.
- Adding a new method LEX::find_cursor(). It searches for a cursor in
this order:
1. Local cursors in the nearst surrounding BEGIN/END block.
2a. A member cursor of the current PACKAGE BODY
(used from the PACKAGE BODY initialization section)
OR
2b. A member cursor of the parrent PACKAGE BODY
(used from a package PROCEDURE or a package FUNCTION)
Adding a new method LEX::find_cursor_with_error().
In case when a cursor is not found, it automatically
raises the ER_SP_CURSOR_MISMATCH SQL condition into
the diagnostics area.
- Adding a new method sp_head::add_instr_copenX().
It creates sp_instr_copen for local cursors,
or sp_instr_copen2 for non-local cursors.
- Adding a new abstract class sp_lex_cursor_instr.
It's used a common parent class for a few sp_instr_xxx classes,
including the new sp_instr_copen2.
This change is needed to avoid code duplication.
- Adding a new protected method sp_instr::print_cmd_and_var(), to print
an instruction using this format: "command name@offset".
It's used from a few implementations of sp_instr_xxx::print(),
including sp_instr_copen2::print().
This change is also needed to avoid code duplication.
- Adding a new method sp_pcontext::frame_for_members_candidate(),
to distinguish easier between local cursors/variables and
PACKAGE BODY cursors/variables.
- Fixing "struct Lex_for_loop_st" to addionally store
a const pointer to Sp_rcontext_handler, to distinguish between:
* FOR rec IN local_cursor
* FOR rec IN package_body_cursor
362 lines
7 KiB
Text
362 lines
7 KiB
Text
#
|
|
# MDEV-32101 CREATE PACKAGE [BODY] for sql_mode=DEFAULT
|
|
#
|
|
CREATE PACKAGE pkg1
|
|
PROCEDURE p1();
|
|
FUNCTION f1() RETURNS INT;
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg1
|
|
PROCEDURE p1()
|
|
BEGIN SELECT 1;
|
|
END;
|
|
FUNCTION f1() RETURNS INT RETURN 1;
|
|
END;
|
|
$$
|
|
SHOW PROCEDURE CODE pkg1.p1;
|
|
Pos Instruction
|
|
0 stmt 0 "SELECT 1"
|
|
SHOW FUNCTION CODE pkg1.f1;
|
|
Pos Instruction
|
|
0 freturn int 1
|
|
SHOW PACKAGE BODY CODE pkg1;
|
|
Pos Instruction
|
|
DROP PACKAGE pkg1;
|
|
CREATE PACKAGE pkg1
|
|
PROCEDURE p1();
|
|
FUNCTION f1() RETURNS INT;
|
|
PROCEDURE p2show();
|
|
PROCEDURE p2public();
|
|
FUNCTION f2public() RETURNS TEXT;
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg1
|
|
DECLARE a INT DEFAULT 10;
|
|
PROCEDURE p1()
|
|
BEGIN
|
|
DECLARE b INT DEFAULT 20;
|
|
SET b=a;
|
|
SET b=a+1;
|
|
SET a=b;
|
|
SET a=b+1;
|
|
SET a=a+1;
|
|
SET @a=@a+2;
|
|
SELECT f1() FROM DUAL;
|
|
END;
|
|
FUNCTION f1() RETURNS INT
|
|
BEGIN
|
|
RETURN a;
|
|
END;
|
|
PROCEDURE p2private()
|
|
BEGIN
|
|
SELECT 'This is p2private';
|
|
END;
|
|
PROCEDURE p2public()
|
|
BEGIN
|
|
SELECT 'This is p2public';
|
|
END;
|
|
FUNCTION f2private() RETURNS TEXT
|
|
BEGIN
|
|
RETURN 'This is f2private';
|
|
END;
|
|
FUNCTION f2public() RETURNS TEXT
|
|
BEGIN
|
|
RETURN 'This is f2public';
|
|
END;
|
|
PROCEDURE p2show()
|
|
BEGIN
|
|
SHOW FUNCTION CODE f2public;
|
|
SHOW FUNCTION CODE f2private;
|
|
SHOW PROCEDURE CODE p2public;
|
|
SHOW PROCEDURE CODE p2private;
|
|
SHOW PROCEDURE CODE p2show;
|
|
END;
|
|
-- Initialization section
|
|
SET a=a+1;
|
|
BEGIN
|
|
DECLARE b INT;
|
|
SET b=a;
|
|
SET b=a+1;
|
|
SET a=b;
|
|
SET a=b+1;
|
|
END;
|
|
END;
|
|
$$
|
|
SHOW PROCEDURE CODE pkg1.p1;
|
|
Pos Instruction
|
|
0 set b@0 20
|
|
1 set b@0 PACKAGE_BODY.a@0
|
|
2 set b@0 PACKAGE_BODY.a@0 + 1
|
|
3 set PACKAGE_BODY.a@0 b@0
|
|
4 set PACKAGE_BODY.a@0 b@0 + 1
|
|
5 set PACKAGE_BODY.a@0 PACKAGE_BODY.a@0 + 1
|
|
6 stmt 31 "SET @a=@a+2"
|
|
7 stmt 0 "SELECT f1() FROM DUAL"
|
|
SHOW FUNCTION CODE pkg1.f1;
|
|
Pos Instruction
|
|
0 freturn int PACKAGE_BODY.a@0
|
|
SHOW PACKAGE BODY CODE pkg1;
|
|
Pos Instruction
|
|
0 set a@0 10
|
|
1 set MEMBER.a@0 MEMBER.a@0 + 1
|
|
2 set b@1 NULL
|
|
3 set b@1 MEMBER.a@0
|
|
4 set b@1 MEMBER.a@0 + 1
|
|
5 set MEMBER.a@0 b@1
|
|
6 set MEMBER.a@0 b@1 + 1
|
|
CALL pkg1.p2show;
|
|
Pos Instruction
|
|
0 freturn blob 'This is f2public'
|
|
Pos Instruction
|
|
0 freturn blob 'This is f2private'
|
|
Pos Instruction
|
|
0 stmt 0 "SELECT 'This is p2public'"
|
|
Pos Instruction
|
|
0 stmt 0 "SELECT 'This is p2private'"
|
|
Pos Instruction
|
|
0 stmt 110 "SHOW FUNCTION CODE f2public"
|
|
1 stmt 110 "SHOW FUNCTION CODE f2private"
|
|
2 stmt 109 "SHOW PROCEDURE CODE p2public"
|
|
3 stmt 109 "SHOW PROCEDURE CODE p2private"
|
|
4 stmt 109 "SHOW PROCEDURE CODE p2show"
|
|
DROP PACKAGE pkg1;
|
|
CREATE TABLE t1 (a INT);
|
|
CREATE PACKAGE pkg1
|
|
PROCEDURE p1();
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg1
|
|
DECLARE a TYPE OF t1.a DEFAULT 10;
|
|
PROCEDURE p1()
|
|
BEGIN
|
|
DECLARE b TYPE OF t1.a DEFAULT 20;
|
|
SET b=a;
|
|
SET b=a+1;
|
|
SET b=b+1;
|
|
SET a=b;
|
|
SET a=b+1;
|
|
SET a=a+1;
|
|
END;
|
|
-- Initialization section
|
|
SET a=a+1;
|
|
BEGIN
|
|
DECLARE b TYPE OF t1.a;
|
|
SET b=a;
|
|
SET b=a+1;
|
|
SET a=b;
|
|
SET a=b+1;
|
|
END;
|
|
END;
|
|
$$
|
|
SHOW PROCEDURE CODE pkg1.p1;
|
|
Pos Instruction
|
|
0 set b@0 20
|
|
1 set b@0 PACKAGE_BODY.a@0
|
|
2 set b@0 PACKAGE_BODY.a@0 + 1
|
|
3 set b@0 b@0 + 1
|
|
4 set PACKAGE_BODY.a@0 b@0
|
|
5 set PACKAGE_BODY.a@0 b@0 + 1
|
|
6 set PACKAGE_BODY.a@0 PACKAGE_BODY.a@0 + 1
|
|
SHOW PACKAGE BODY CODE pkg1;
|
|
Pos Instruction
|
|
0 set a@0 10
|
|
1 set MEMBER.a@0 MEMBER.a@0 + 1
|
|
2 set b@1 NULL
|
|
3 set b@1 MEMBER.a@0
|
|
4 set b@1 MEMBER.a@0 + 1
|
|
5 set MEMBER.a@0 b@1
|
|
6 set MEMBER.a@0 b@1 + 1
|
|
DROP PACKAGE pkg1;
|
|
DROP TABLE t1;
|
|
CREATE PACKAGE pkg1
|
|
PROCEDURE p1();
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg1
|
|
DECLARE a ROW(a INT,b TEXT) DEFAULT ROW(10,'x10');
|
|
PROCEDURE p1()
|
|
BEGIN
|
|
DECLARE b ROW(a INT,b TEXT) DEFAULT ROW(20,'x20');
|
|
SET b=a;
|
|
SET a=b;
|
|
SET b.a=a.a+1;
|
|
SET a.a=b.a+1;
|
|
SET a.a=a.a+1;
|
|
END;
|
|
-- Initialization section
|
|
SET a.a:=a.a+1;
|
|
BEGIN
|
|
DECLARE b ROW(a INT,b TEXT) DEFAULT ROW(30,'x30');
|
|
SET b=a;
|
|
SET b.a=a.a+1;
|
|
SET a=b;
|
|
SET a.a=b.a+1;
|
|
END;
|
|
END;
|
|
$$
|
|
SHOW PROCEDURE CODE pkg1.p1;
|
|
Pos Instruction
|
|
0 set b@0 (20,'x20')
|
|
1 set b@0 PACKAGE_BODY.a@0
|
|
2 set PACKAGE_BODY.a@0 b@0
|
|
3 set b.a@0[0] PACKAGE_BODY.a.a@0[0] + 1
|
|
4 set PACKAGE_BODY.a.a@0[0] b.a@0[0] + 1
|
|
5 set PACKAGE_BODY.a.a@0[0] PACKAGE_BODY.a.a@0[0] + 1
|
|
SHOW PACKAGE BODY CODE pkg1;
|
|
Pos Instruction
|
|
0 set a@0 (10,'x10')
|
|
1 set MEMBER.a.a@0[0] MEMBER.a.a@0[0] + 1
|
|
2 set b@1 (30,'x30')
|
|
3 set b@1 MEMBER.a@0
|
|
4 set b.a@1[0] MEMBER.a.a@0[0] + 1
|
|
5 set MEMBER.a@0 b@1
|
|
6 set MEMBER.a.a@0[0] b.a@1[0] + 1
|
|
DROP PACKAGE pkg1;
|
|
CREATE TABLE t1 (a INT, b TEXT);
|
|
CREATE PACKAGE pkg1
|
|
PROCEDURE p1();
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg1
|
|
DECLARE a ROW TYPE OF t1 DEFAULT ROW(10,'x10');
|
|
PROCEDURE p1()
|
|
BEGIN
|
|
DECLARE b ROW TYPE OF t1 DEFAULT ROW(20,'x20');
|
|
SET b=a;
|
|
SET a=b;
|
|
SET b.a=a.a+1;
|
|
SET a.a=b.a+1;
|
|
SET a.a=a.a+1;
|
|
END;
|
|
-- Initialization section
|
|
SET a.a=a.a+1;
|
|
BEGIN
|
|
DECLARE b ROW TYPE OF t1 DEFAULT ROW(30,'x30');
|
|
SET b=a;
|
|
SET b.a=a.a+1;
|
|
SET a=b;
|
|
SET a.a=b.a+1;
|
|
END;
|
|
END;
|
|
$$
|
|
SHOW PROCEDURE CODE pkg1.p1;
|
|
Pos Instruction
|
|
0 set b@0 (20,'x20')
|
|
1 set b@0 PACKAGE_BODY.a@0
|
|
2 set PACKAGE_BODY.a@0 b@0
|
|
3 set b.a@0["a"] PACKAGE_BODY.a.a@0["a"] + 1
|
|
4 set PACKAGE_BODY.a.a@0["a"] b.a@0["a"] + 1
|
|
5 set PACKAGE_BODY.a.a@0["a"] PACKAGE_BODY.a.a@0["a"] + 1
|
|
SHOW PACKAGE BODY CODE pkg1;
|
|
Pos Instruction
|
|
0 set a@0 (10,'x10')
|
|
1 set MEMBER.a.a@0["a"] MEMBER.a.a@0["a"] + 1
|
|
2 set b@1 (30,'x30')
|
|
3 set b@1 MEMBER.a@0
|
|
4 set b.a@1["a"] MEMBER.a.a@0["a"] + 1
|
|
5 set MEMBER.a@0 b@1
|
|
6 set MEMBER.a.a@0["a"] b.a@1["a"] + 1
|
|
DROP PACKAGE pkg1;
|
|
DROP TABLE t1;
|
|
# Start of 11.4 tests
|
|
#
|
|
# MDEV-36047 Package body variables are not allowed as FETCH targets
|
|
#
|
|
CREATE PACKAGE pkg
|
|
FUNCTION f1() RETURNS INT;
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg
|
|
DECLARE vc INT DEFAULT 0;
|
|
FUNCTION f1() RETURNS INT
|
|
BEGIN
|
|
DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
|
|
OPEN cur;
|
|
FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
|
|
CLOSE cur;
|
|
RETURN vc;
|
|
END;
|
|
BEGIN
|
|
DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
|
|
OPEN cur;
|
|
FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
|
|
CLOSE cur;
|
|
END;
|
|
END;
|
|
$$
|
|
SELECT pkg.f1() FROM DUAL;
|
|
pkg.f1()
|
|
1
|
|
SHOW FUNCTION CODE pkg.f1;
|
|
Pos Instruction
|
|
0 cpush cur@0
|
|
1 copen cur@0
|
|
2 cfetch cur@0 PACKAGE_BODY.vc@0
|
|
3 cclose cur@0
|
|
4 freturn int PACKAGE_BODY.vc@0
|
|
SHOW PACKAGE BODY CODE pkg;
|
|
Pos Instruction
|
|
0 set vc@0 0
|
|
1 cpush cur@0
|
|
2 copen cur@0
|
|
3 cfetch cur@0 MEMBER.vc@0
|
|
4 cclose cur@0
|
|
5 cpop 1
|
|
DROP PACKAGE pkg;
|
|
CREATE PACKAGE pkg
|
|
FUNCTION f1() RETURNS TEXT;
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg
|
|
DECLARE vc1 INT DEFAULT 0;
|
|
FUNCTION f1() RETURNS TEXT
|
|
BEGIN
|
|
DECLARE vc2 INT DEFAULT 0;
|
|
DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
|
|
OPEN cur;
|
|
FETCH cur INTO vc1, vc2;
|
|
CLOSE cur;
|
|
RETURN CONCAT(vc1, ' ', vc2);
|
|
END;
|
|
END;
|
|
$$
|
|
SELECT pkg.f1() FROM DUAL;
|
|
pkg.f1()
|
|
1 2
|
|
SHOW FUNCTION CODE pkg.f1;
|
|
Pos Instruction
|
|
0 set vc2@0 0
|
|
1 cpush cur@0
|
|
2 copen cur@0
|
|
3 cfetch cur@0 PACKAGE_BODY.vc1@0 vc2@0
|
|
4 cclose cur@0
|
|
5 freturn blob concat(PACKAGE_BODY.vc1@0,' ',vc2@0)
|
|
DROP PACKAGE pkg;
|
|
CREATE PACKAGE pkg
|
|
FUNCTION f1() RETURNS TEXT;
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY pkg
|
|
DECLARE vc ROW(p1 INT, p2 INT);
|
|
FUNCTION f1() RETURNS TEXT
|
|
BEGIN
|
|
DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
|
|
OPEN cur;
|
|
FETCH cur INTO vc;
|
|
CLOSE cur;
|
|
RETURN CONCAT(vc.p1, ' ', vc.p2);
|
|
END;
|
|
END;
|
|
$$
|
|
SELECT pkg.f1() FROM DUAL;
|
|
pkg.f1()
|
|
1 2
|
|
SHOW FUNCTION CODE pkg.f1;
|
|
Pos Instruction
|
|
0 cpush cur@0
|
|
1 copen cur@0
|
|
2 cfetch cur@0 PACKAGE_BODY.vc@0
|
|
3 cclose cur@0
|
|
4 freturn blob concat(PACKAGE_BODY.vc.p1@0[0],' ',PACKAGE_BODY.vc.p2@0[1])
|
|
DROP PACKAGE pkg;
|
|
# End of 11.4 tests
|