Skip to content

Filtering by tags fixed for schemas containing suite-paths and contexts #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgebal merged 2 commits into from
May 6, 2026
Merged

Filtering by tags fixed for schemas containing suite-paths and contexts #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
566b9ec
Filtering by tags fixed for schemas containing suite-paths and contexts
May 6, 2026
30aeb00
Added missing unit tests
May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 91 additions & 96 deletions source/core/ut_suite_tag_filter.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,28 @@
/**
* Constants use in postfix and infix transformations
*/
gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!');
gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!');
gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator
gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator
gc_reserved_tag_words constant ut_varchar2_list := ut_varchar2_list('none','any');
gc_tags_column_name constant varchar2(250) := 'tags';
gc_exception_msg constant varchar2(200) := 'Invalid tag expression';
type t_precedence_table is table of number index by varchar2(1);
g_precedence t_precedence_table;

type t_precedence_table is table of number index by varchar2(1);
g_precedence t_precedence_table;

function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list is
l_tags_tokens ut_varchar2_list := ut_varchar2_list();
l_tags_tokens ut_varchar2_list := ut_varchar2_list();
begin
--Tokenize a string into operators and tags
select regexp_substr(a_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts
bulk collect into l_tags_tokens
from dual connect by regexp_substr (a_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null;

return l_tags_tokens;
end;

/*
To support a legact tag notation
To support a legact tag notation
, = OR
- = NOT
we will perform a replace of that characters into
Expand All @@ -57,36 +56,36 @@
l_tags_exclude varchar2(4000);
l_return_tag varchar2(4000);
begin
if instr(a_tags,',') > 0 or instr(a_tags,'-') > 0 then
if instr(a_tags,',') > 0 or instr(a_tags,'-') > 0 then

select '('||listagg( t.column_value,'|')
within group( order by column_value)||')'
within group( order by column_value)||')'
into l_tags_include
from table(l_tags) t
where t.column_value not like '-%';

select '('||listagg( replace(t.column_value,'-','!'),' & ')
within group( order by column_value)||')'
into l_tags_exclude
from table(l_tags) t
where t.column_value like '-%';
where t.column_value like '-%';


l_return_tag:=
case
case
when l_tags_include <> '()' and l_tags_exclude <> '()'
then l_tags_include || ' & ' || l_tags_exclude
when l_tags_include <> '()'
then l_tags_include
when l_tags_exclude <> '()'
then l_tags_exclude
then l_tags_exclude
end;
else
else
l_return_tag := a_tags;
end if;
end if;
return l_return_tag;
end;

/*
https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression
*/
Expand All @@ -97,14 +96,14 @@
l_expect_operand boolean := true;
l_expect_operator boolean := false;
l_idx pls_integer;
begin
begin
l_idx := a_tags.first;
--Exuecute modified shunting algorithm
WHILE (l_idx is not null) loop
l_token := a_tags(l_idx);
if (l_token member of gc_operators and l_token member of gc_binary_operators) then
if not(l_expect_operator) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
if not(l_expect_operator) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop
l_rnp_tokens.extend;
Expand All @@ -113,56 +112,56 @@
l_operator_stack.push(a_tags(l_idx));
l_expect_operand := true;
l_expect_operator:= false;
elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then
if not(l_expect_operand) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then
if not(l_expect_operand) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
l_operator_stack.push(a_tags(l_idx));
l_expect_operand := true;
l_expect_operator:= false;
l_expect_operator:= false;
elsif l_token = '(' then
if not(l_expect_operand) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
if not(l_expect_operand) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
l_operator_stack.push(a_tags(l_idx));
l_expect_operand := true;
l_expect_operator:= false;
l_expect_operator:= false;
elsif l_token = ')' then
if not(l_expect_operator) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
if not(l_expect_operator) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
while l_operator_stack.peek <> '(' loop
l_rnp_tokens.extend;
l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop;
end loop;
l_operator_stack.pop; --Pop the open bracket and discard it
l_expect_operand := false;
l_expect_operator:= true;
l_expect_operator:= true;
else
if not(l_expect_operand) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
if not(l_expect_operand) then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
l_rnp_tokens.extend;
l_rnp_tokens(l_rnp_tokens.last) :=l_token;
l_expect_operator := true;
l_expect_operand := false;
end if;

l_idx := a_tags.next(l_idx);
end loop;

while l_operator_stack.peek is not null loop
if l_operator_stack.peek in ('(',')') then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
if l_operator_stack.peek in ('(',')') then
raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
end if;
l_rnp_tokens.extend;
l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop;
l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop;
end loop;

return l_rnp_tokens;
end shunt_logical_expression;
function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list,a_tags_column_name in varchar2)

function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list,a_tags_column_name in varchar2)
return varchar2 is
l_infix_stack ut_stack := ut_stack();
l_right_side varchar2(32767);
Expand All @@ -175,22 +174,22 @@
while ( l_idx is not null) loop
--If the token we got is a none or any keyword
if a_postfix_exp(l_idx) member of gc_reserved_tag_words then
l_infix_stack.push(
case

l_infix_stack.push(
case
when a_postfix_exp(l_idx) = 'none' then '('||a_tags_column_name||' is empty or '||a_tags_column_name||' is null)'
else a_tags_column_name||' is not empty'
end
);
--If token is operand but also single tag
elsif regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then
l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token);
--If token is unary operator not
--If token is unary operator not
elsif a_postfix_exp(l_idx) member of gc_unary_operators then
l_right_side := l_infix_stack.pop;
l_infix_exp := a_postfix_exp(l_idx)||'('||l_right_side||')';
l_infix_stack.push(l_infix_exp);
--If token is binary operator
--If token is binary operator
elsif a_postfix_exp(l_idx) member of gc_binary_operators then
l_right_side := l_infix_stack.pop;
l_left_side := l_infix_stack.pop;
Expand All @@ -199,7 +198,7 @@
end if;
l_idx := a_postfix_exp.next(l_idx);
end loop;

return l_infix_stack.pop;
end conv_postfix_to_infix_sql;

Expand All @@ -208,73 +207,69 @@
l_tags varchar2(4000);
begin
l_tags := replace(replace_legacy_tag_notation(a_tags),' ');
l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(tokenize_tags_string(l_tags)),gc_tags_column_name);
l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(tokenize_tags_string(l_tags)),'tags');
l_tags := replace(l_tags, '|',' or ');
l_tags := replace(l_tags ,'&',' and ');
l_tags := replace(l_tags ,'!','not');
return l_tags;
end;
return l_tags;
end;


/*
Having a base set of suites we will do a further filter down if there are
any tags defined.
*/
*/
function get_tags_suites (
a_suite_items ut_suite_cache_rows,
a_tags varchar2
) return ut_suite_cache_rows is
l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows();
l_results ut_suite_cache_rows;
l_sql varchar2(32000);
l_tags varchar2(4000):= create_where_filter(a_tags);
l_tags_filter_clause varchar2(4000):= create_where_filter(a_tags);
begin
l_sql :=
q'[
with
suites_mv as (
select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags as ]'||gc_tags_column_name||q'[
from table(:suite_items) c
),
suites_matching_expr as (
select c.id,c.path as path,c.self_type,c.object_owner,c.tags
from suites_mv c
where c.self_type in ('UT_SUITE','UT_CONTEXT')
and ]'||l_tags||q'[
),
tests_matching_expr as (
select c.id,c.path as path,c.self_type,c.object_owner,c.tags as ]'||gc_tags_column_name||q'[
from suites_mv c where c.self_type in ('UT_TEST')
and ]'||l_tags||q'[
),
tests_with_tags_inh_from_suite as (
select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags as ]'||gc_tags_column_name||q'[ ,c.object_owner
from suites_mv c join suites_matching_expr t
on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner)
),
tests_with_tags_prom_to_suite as (
select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags as ]'||gc_tags_column_name||q'[ ,c.object_owner
from suites_mv c join tests_matching_expr t
on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner)
)
select obj from suites_mv c,
(select id,row_number() over (partition by id order by id) r_num from
(select id
from tests_with_tags_prom_to_suite tst
where ]'||l_tags||q'[
union all
select id from tests_with_tags_inh_from_suite tst
where ]'||l_tags||q'[
)
) t where c.id = t.id and r_num = 1 ]';
execute immediate l_sql bulk collect into l_suite_tags using a_suite_items;
return l_suite_tags;
with
suites_mv as (
select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags as tags
from table(:suite_items) c
),
propagate_tags_from_ancestors as (
select c.id, c.self_type, c.path, c.object_owner, cast(collect(c_tags.tag) as ut_varchar2_rows) as tags
from suites_mv c
left join suites_mv t
on t.self_type in ('UT_SUITE','UT_SUITE_CONTEXT')
and c.path like t.path||'.%' /* all descendants */
and c.object_owner = t.object_owner
outer apply (select column_value tag from table(c.tags) union select column_value tag from table(t.tags) ) c_tags
group by c.id, c.self_type, c.path, c.object_owner
),
filter_by_tags as (
select *
from propagate_tags_from_ancestors x
where ( ]'||l_tags_filter_clause||q'[ )
),
only_items_with_tests as (
select item.obj
from suites_mv item
where exists (
select 1
from filter_by_tags tst
where tst.self_type in ('UT_TEST')
and (tst.path||'.' like item.path || '.%' /*all descendants and self*/ and item.object_owner = tst.object_owner)
)
)
select obj from only_items_with_tests]';
execute immediate l_sql bulk collect into l_results using a_suite_items;

Check failure on line 263 in source/core/ut_suite_tag_filter.pkb

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add a WHEN OTHERS exception handler to ensure that all exceptions are trapped. 


See more on https://sonarcloud.io/project/issues?id=utPLSQL_utPLSQL&issues=AZ3_FIajXpy0OoYLrOIa&open=AZ3_FIajXpy0OoYLrOIa&pullRequest=1325

return l_results;
end;

function apply(
a_unfiltered_rows ut_suite_cache_rows,
a_tags varchar2 := null
) return ut_suite_cache_rows is
l_suite_items ut_suite_cache_rows := a_unfiltered_rows;
l_suite_items ut_suite_cache_rows := a_unfiltered_rows;
begin
if length(a_tags) > 0 then
l_suite_items := get_tags_suites(l_suite_items,a_tags);
Expand Down
3 changes: 1 addition & 2 deletions test/install_and_run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#!/bin/bash
set -ev

. ./development/env.sh

#goto git root directory
git rev-parse && cd "$(git rev-parse --show-cdup)"
. ./development/env.sh
cd test

time . ./install_tests.sh
Expand Down
Loading
Loading