mirror of
https://github.com/MariaDB/server.git
synced 2025-08-18 08:21:37 +02:00
75142ff496
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
294 lines
8.2 KiB
Text
294 lines
8.2 KiB
Text
set @@global.collation_server=@@session.collation_server;
|
|
#
|
|
# MDEV-29167: new db-level SHOW CREATE ROUTINE privilege
|
|
#
|
|
###
|
|
### SHOW-Like commad test
|
|
###
|
|
SET @save_sql_mode=@@sql_mode;
|
|
#
|
|
### Prepare functions for the test and SHOW-like by owner
|
|
#
|
|
create database test_db;
|
|
use test_db;
|
|
create procedure test_db.sp() select 1;
|
|
show procedure code test_db.sp;
|
|
Pos Instruction
|
|
0 stmt 0 "select 1"
|
|
CREATE FUNCTION test_db.fn() RETURNS INT RETURN 1;
|
|
show function code test_db.fn;
|
|
Pos Instruction
|
|
0 freturn int 1
|
|
SET sql_mode=ORACLE;
|
|
CREATE PACKAGE test_db.pk AS
|
|
FUNCTION pkf() RETURN INT;
|
|
PROCEDURE pkp();
|
|
END;
|
|
$$
|
|
CREATE PACKAGE BODY test_db.pk AS
|
|
pkv INT:=1;
|
|
PROCEDURE pkhp() AS
|
|
BEGIN
|
|
SELECT pkv FROM DUAL;
|
|
END;
|
|
FUNCTION pkhf() RETURN INT AS
|
|
BEGIN
|
|
RETURN pkv;
|
|
END;
|
|
PROCEDURE pkp() AS
|
|
BEGIN
|
|
CALL pkhp();
|
|
END;
|
|
FUNCTION pkf() RETURN INT AS
|
|
BEGIN
|
|
RETURN pkhf();
|
|
END;
|
|
BEGIN
|
|
pkv:=2;
|
|
END;
|
|
$$
|
|
SET sql_mode=@save_sql_mode;
|
|
show package code test_db.pk;
|
|
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'code test_db.pk' at line 1
|
|
show package body code test_db.pk;
|
|
Pos Instruction
|
|
0 set pkv@0 1
|
|
1 set MEMBER.pkv@0 2
|
|
use test;
|
|
###
|
|
### Pre-"SHOW-CREATE-ROUTINE" behaviour tests
|
|
###
|
|
#
|
|
### Rights on mysql.proc
|
|
#
|
|
create user user@localhost;
|
|
grant all privileges on mysql.* to user@localhost;
|
|
grant all privileges on test.* to user@localhost;
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
Pos Instruction
|
|
0 stmt 0 "select 1"
|
|
show function code test_db.fn;
|
|
Pos Instruction
|
|
0 freturn int 1
|
|
show package body code test_db.pk;
|
|
Pos Instruction
|
|
0 set pkv@0 1
|
|
1 set MEMBER.pkv@0 2
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke all privileges on mysql.* from user@localhost;
|
|
#
|
|
### No privileges
|
|
#
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
ERROR 42000: PROCEDURE sp does not exist
|
|
show function code test_db.fn;
|
|
ERROR 42000: FUNCTION fn does not exist
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
#
|
|
### Execute provilege PROCEDURE/FUNCTION
|
|
#
|
|
grant execute on procedure test_db.sp to user@localhost;
|
|
grant execute on function test_db.fn to user@localhost;
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
ERROR 42000: PROCEDURE sp does not exist
|
|
show function code test_db.fn;
|
|
ERROR 42000: FUNCTION fn does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke execute on procedure test_db.sp from user@localhost;
|
|
revoke execute on function test_db.fn from user@localhost;
|
|
#
|
|
### Execute provilege PACKAGE+ PACKAGE BODY-
|
|
#
|
|
SET sql_mode=ORACLE;
|
|
grant execute on package test_db.pk to user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
connect conn1, localhost, user, , test;
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
SET sql_mode=ORACLE;
|
|
revoke execute on package test_db.pk from user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
#
|
|
### Execute provilege PACKAGE- PACKAGE BODY+
|
|
#
|
|
SET sql_mode=ORACLE;
|
|
grant execute on package body test_db.pk to user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
connect conn1, localhost, user, , test;
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
SET sql_mode=ORACLE;
|
|
revoke execute on package body test_db.pk from user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
#
|
|
### Alter routine provilege PROCEDURE/FUNCTION
|
|
#
|
|
grant alter routine on procedure test_db.sp to user@localhost;
|
|
grant alter routine on function test_db.fn to user@localhost;
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
ERROR 42000: PROCEDURE sp does not exist
|
|
show function code test_db.fn;
|
|
ERROR 42000: FUNCTION fn does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke alter routine on procedure test_db.sp from user@localhost;
|
|
revoke alter routine on function test_db.fn from user@localhost;
|
|
#
|
|
### Alter routine provilege PACKAGE+ PACKAGE BODY-
|
|
#
|
|
SET sql_mode=ORACLE;
|
|
grant alter routine on package test_db.pk to user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
connect conn1, localhost, user, , test;
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
SET sql_mode=ORACLE;
|
|
revoke alter routine on package test_db.pk from user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
#
|
|
### Alter routine provilege PACKAGE+ PACKAGE BODY-
|
|
#
|
|
SET sql_mode=ORACLE;
|
|
grant alter routine on package body test_db.pk to user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
connect conn1, localhost, user, , test;
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
SET sql_mode=ORACLE;
|
|
revoke alter routine on package body test_db.pk from user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
###
|
|
### SHOW CREATE PROCEDURE tests
|
|
###
|
|
#
|
|
### Global "show create routine" test
|
|
#
|
|
grant show create routine on *.* to user@localhost;
|
|
show grants for user@localhost;
|
|
Grants for user@localhost
|
|
GRANT SHOW CREATE ROUTINE ON *.* TO `user`@`localhost`
|
|
GRANT ALL PRIVILEGES ON `test`.* TO `user`@`localhost`
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
Pos Instruction
|
|
0 stmt 0 "select 1"
|
|
show function code test_db.fn;
|
|
Pos Instruction
|
|
0 freturn int 1
|
|
show package body code test_db.pk;
|
|
Pos Instruction
|
|
0 set pkv@0 1
|
|
1 set MEMBER.pkv@0 2
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke show create routine on *.* from user@localhost;
|
|
#
|
|
### DB-level "show create routine" but other DB test
|
|
#
|
|
grant show create routine on db_test.* to user@localhost;
|
|
show grants for user@localhost;
|
|
Grants for user@localhost
|
|
GRANT USAGE ON *.* TO `user`@`localhost`
|
|
GRANT ALL PRIVILEGES ON `test`.* TO `user`@`localhost`
|
|
GRANT SHOW CREATE ROUTINE ON `db_test`.* TO `user`@`localhost`
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
ERROR 42000: PROCEDURE sp does not exist
|
|
show function code test_db.fn;
|
|
ERROR 42000: FUNCTION fn does not exist
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke show create routine on db_test.* from user@localhost;
|
|
#
|
|
### DB-level "show create routine" test
|
|
#
|
|
grant show create routine on test_db.* to user@localhost;
|
|
show grants for user@localhost;
|
|
Grants for user@localhost
|
|
GRANT USAGE ON *.* TO `user`@`localhost`
|
|
GRANT ALL PRIVILEGES ON `test`.* TO `user`@`localhost`
|
|
GRANT SHOW CREATE ROUTINE ON `test_db`.* TO `user`@`localhost`
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
Pos Instruction
|
|
0 stmt 0 "select 1"
|
|
show function code test_db.fn;
|
|
Pos Instruction
|
|
0 freturn int 1
|
|
show package body code test_db.pk;
|
|
Pos Instruction
|
|
0 set pkv@0 1
|
|
1 set MEMBER.pkv@0 2
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke show create routine on test_db.* from user@localhost;
|
|
#
|
|
### Routine-level "show create routine" PROCEDURE and FUNCTION
|
|
#
|
|
grant show create routine on procedure test_db.sp to user@localhost;
|
|
grant show create routine on function test_db.fn to user@localhost;
|
|
connect conn1, localhost, user, , test;
|
|
show procedure code test_db.sp;
|
|
Pos Instruction
|
|
0 stmt 0 "select 1"
|
|
show function code test_db.fn;
|
|
Pos Instruction
|
|
0 freturn int 1
|
|
connection default;
|
|
disconnect conn1;
|
|
revoke show create routine on procedure test_db.sp from user@localhost;
|
|
revoke show create routine on function test_db.fn from user@localhost;
|
|
#
|
|
### Routine-level "show create routine" PACKAGE+ PACKAGE BODY-
|
|
#
|
|
SET sql_mode=ORACLE;
|
|
grant show create routine on package test_db.pk to user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
connect conn1, localhost, user, , test;
|
|
show package body code test_db.pk;
|
|
ERROR 42000: PACKAGE BODY pk does not exist
|
|
connection default;
|
|
disconnect conn1;
|
|
SET sql_mode=ORACLE;
|
|
revoke show create routine on package test_db.pk from user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
#
|
|
### Routine-level "show create routine" PACKAGE- PACKAGE BODY+
|
|
#
|
|
SET sql_mode=ORACLE;
|
|
grant show create routine on package body test_db.pk to user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
connect conn1, localhost, user, , test;
|
|
show package body code test_db.pk;
|
|
Pos Instruction
|
|
0 set pkv@0 1
|
|
1 set MEMBER.pkv@0 2
|
|
connection default;
|
|
disconnect conn1;
|
|
SET sql_mode=ORACLE;
|
|
revoke show create routine on package body test_db.pk from user@localhost;
|
|
SET sql_mode=@save_sql_mode;
|
|
drop database test_db;
|
|
drop user user@localhost;
|
|
#
|
|
# End of 11.3 tests
|
|
#
|