Skip to content

Commit d2822ec

Browse files
jgebaljgebal
committed
Merge remote-tracking branch 'upstream/develop' into feature/refactoing_assert_to_expectation
2 parents 6f7125c + c13710c commit d2822ec

9 files changed

Lines changed: 35 additions & 9 deletions

‎source/api/ut.pkb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ create or replace package body ut is
9999
rollback;
100100
end;
101101

102-
function run(a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_list pipelined is
102+
function run(a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_rows pipelined is
103103
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
104104
l_paths ut_varchar2_list := ut_varchar2_list(sys_context('userenv', 'current_schema'));
105105
l_lines sys_refcursor;
@@ -115,7 +115,7 @@ create or replace package body ut is
115115
close l_lines;
116116
end;
117117

118-
function run(a_paths ut_varchar2_list, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_list pipelined is
118+
function run(a_paths ut_varchar2_list, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_rows pipelined is
119119
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
120120
l_lines sys_refcursor;
121121
l_line varchar2(4000);
@@ -130,7 +130,7 @@ create or replace package body ut is
130130
close l_lines;
131131
end;
132132

133-
function run(a_path varchar2, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_list pipelined is
133+
function run(a_path varchar2, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_rows pipelined is
134134
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
135135
l_paths ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema')));
136136
l_lines sys_refcursor;

‎source/api/ut.pks‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ create or replace package ut authid current_user as
4747

4848
procedure fail(a_message in varchar2);
4949

50-
function run(a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_list pipelined;
50+
function run(a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_rows pipelined;
5151

52-
function run(a_paths ut_varchar2_list, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_list pipelined;
52+
function run(a_paths ut_varchar2_list, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_rows pipelined;
5353

54-
function run(a_path varchar2, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_list pipelined;
54+
function run(a_path varchar2, a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console integer := 0) return ut_varchar2_rows pipelined;
5555

5656
procedure run(a_reporter ut_reporter_base := ut_documentation_reporter(), a_color_console boolean := false);
5757

‎source/core/types/ut_varchar2_rows.tps‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
create or replace type ut_varchar2_rows as
2+
/*
3+
utPLSQL - Version X.X.X.X
4+
Copyright 2016 - 2017 utPLSQL Project
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"):
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
table of varchar2(4000 byte)
19+
/

‎source/core/ut_output_buffer.pkb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ create or replace package body ut_output_buffer is
5454
commit;
5555
end;
5656

57-
function get_lines(a_reporter_id varchar2, a_timeout_sec naturaln := gc_max_wait_sec) return ut_varchar2_list pipelined is
57+
function get_lines(a_reporter_id varchar2, a_timeout_sec naturaln := gc_max_wait_sec) return ut_varchar2_rows pipelined is
5858
pragma autonomous_transaction;
59-
l_results ut_varchar2_list;
59+
l_results ut_varchar2_rows;
6060
l_wait_wait_time number(10,1) := 0;
6161
l_finished boolean := false;
6262
begin

‎source/core/ut_output_buffer.pks‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ create or replace package ut_output_buffer authid definer is
2626

2727
procedure close(a_reporters ut_reporters);
2828

29-
function get_lines(a_reporter_id varchar2, a_timeout_sec naturaln := gc_max_wait_sec) return ut_varchar2_list pipelined;
29+
function get_lines(a_reporter_id varchar2, a_timeout_sec naturaln := gc_max_wait_sec) return ut_varchar2_rows pipelined;
3030

3131
function get_lines_cursor(a_reporter_id varchar2, a_timeout_sec naturaln := gc_max_wait_sec) return sys_refcursor;
3232

‎source/create_synonyms_and_grants_for_public.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ grant execute on ut_coverage_sonar_reporter to public;
5050
grant execute on ut_coveralls_reporter to public;
5151
grant execute on ut_reporters to public;
5252
grant execute on ut_varchar2_list to public;
53+
grant execute on ut_varchar2_rows to public;
5354
grant execute on ut_reporter_base to public;
5455
grant execute on ut_coverage to public;
5556
grant execute on ut_coverage_helper to public;
@@ -85,6 +86,7 @@ create public synonym ut_coverage_sonar_reporter for ut_coverage_sonar_reporter;
8586
create public synonym ut_coveralls_reporter for ut_coveralls_reporter;
8687
create public synonym ut_reporters for ut_reporters;
8788
create public synonym ut_varchar2_list for ut_varchar2_list;
89+
create public synonym ut_varchar2_rows for ut_varchar2_rows;
8890
create public synonym ut_reporter_base for ut_reporter_base;
8991
create public synonym ut_coverage for ut_coverage;
9092
create public synonym ut_coverage_helper for ut_coverage_helper;

‎source/create_synonyms_and_grants_for_user.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ grant execute on ut_coverage_sonar_reporter to &ut3_user;
5151
grant execute on ut_coveralls_reporter to &ut3_user;
5252
grant execute on ut_reporters to &ut3_user;
5353
grant execute on ut_varchar2_list to &ut3_user;
54+
grant execute on ut_varchar2_rows to &ut3_user;
5455
grant execute on ut_reporter_base to &ut3_user;
5556
grant execute on ut_coverage to &ut3_user;
5657
grant execute on ut_coverage_helper to &ut3_user;
@@ -86,6 +87,7 @@ create or replace synonym &ut3_user .ut_coverage_sonar_reporter for ut_coverage_
8687
create or replace synonym &ut3_user .ut_coveralls_reporter for ut_coveralls_reporter;
8788
create or replace synonym &ut3_user .ut_reporters for ut_reporters;
8889
create or replace synonym &ut3_user .ut_varchar2_list for ut_varchar2_list;
90+
create or replace synonym &ut3_user .ut_varchar2_rows for ut_varchar2_rows;
8991
create or replace synonym &ut3_user .ut_reporter_base for ut_reporter_base;
9092
create or replace synonym &ut3_user .ut_coverage for ut_coverage;
9193
create or replace synonym &ut3_user .ut_coverage_helper for ut_coverage_helper;

‎source/install.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ whenever oserror exit failure rollback
3535

3636
--common utilities
3737
@@core/types/ut_varchar2_list.tps
38+
@@core/types/ut_varchar2_rows.tps
3839
@@core/types/ut_object_name.tps
3940
@@core/types/ut_object_name.tpb
4041
@@core/types/ut_object_names.tps

‎source/uninstall.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ drop type ut_object_name;
231231

232232
drop type ut_varchar2_list;
233233

234+
drop type ut_varchar2_rows;
235+
234236
begin
235237
for syn in (
236238
select

0 commit comments

Comments
 (0)