6
0
mirror of https://github.com/FirebirdSQL/firebird-qa.git synced 2025-01-22 21:43:06 +01:00

Added/Updated tests\bugs\core_2920_test.py: Writing code requires more care since 6.0.0.150: ISQL does not allow specifying duplicate delimiters without any statements between them (two semicolon, two carets etc).

This commit is contained in:
pavel-zotov 2023-11-26 01:08:34 +03:00
parent 76fe9040d7
commit 2306a05648

View File

@ -7,62 +7,56 @@ TITLE: Incorrect execution of volatile SQL statements inside EXECUTE STATE
DESCRIPTION: DESCRIPTION:
JIRA: CORE-2920 JIRA: CORE-2920
FBTEST: bugs.core_2920 FBTEST: bugs.core_2920
NOTES:
[25.11.2023] pzotov
Writing code requires more care since 6.0.0.150: ISQL does not allow specifying duplicate delimiters without any statements between them (two semicolon, two carets etc).
""" """
import pytest import pytest
from firebird.qa import * from firebird.qa import *
init_script = """create table bugtest (id int); init_script = """
insert into bugtest (id) values (123); create table bugtest (id int);
set term !!; insert into bugtest (id) values (123);
create procedure p_bugtest (in_id int) set term ^;
returns (cnt int) create procedure p_bugtest (in_id int)
as returns (cnt int)
declare predicate varchar(1000); as
begin declare predicate varchar(1000);
if (:in_id is null) then begin
predicate = ' ? is null'; if (:in_id is null) then
else predicate = ' ? is null';
predicate = ' id = ?'; else
predicate = ' id = ?';
execute statement ('select count(*) from bugtest where' || predicate) (:in_id) execute statement ('select count(*) from bugtest where' || predicate) (:in_id)
into :cnt; into :cnt;
end!! end
set term !!; ^
commit;""" set term ;^
commit;
"""
db = db_factory(charset='UTF8', init=init_script) db = db_factory(charset='UTF8', init=init_script)
test_script = """execute procedure p_bugtest (123); test_script = """
-- cnt = 1 set list on;
execute procedure p_bugtest (null); execute procedure p_bugtest (123);
-- cnt = 1 execute procedure p_bugtest (null);
execute procedure p_bugtest (123); execute procedure p_bugtest (123);
-- cnt = 1
""" """
act = isql_act('db', test_script) act = isql_act('db', test_script)
expected_stdout = """ expected_stdout = """
CNT CNT 1
============ CNT 1
1 CNT 1
CNT
============
1
CNT
============
1
""" """
@pytest.mark.version('>=3.0') @pytest.mark.version('>=3.0')
def test_1(act: Action): def test_1(act: Action):
act.expected_stdout = expected_stdout act.expected_stdout = expected_stdout
act.execute() act.execute(combine_output = True)
assert act.clean_stdout == act.clean_expected_stdout assert act.clean_stdout == act.clean_expected_stdout