Skip to content

Fix/exclude column position #913

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 5 commits into from
May 10, 2019
Merged

Fix/exclude column position #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ceb774
Fix to issue when column was removed from the middle of cursor using …
lwasylow May 8, 2019
f248f88
Fix typo
May 8, 2019
367958d
Make sure that order of the columns is kept when rewriting an order a…
May 8, 2019
525da02
Partition should not be across column name but a full table set.
May 8, 2019
e088211
Removal of row_number as its excessive we dont partition by any
lwasylow May 8, 2019
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
20 changes: 20 additions & 0 deletions source/expectations/data_values/ut_cursor_details.tpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ create or replace type body ut_cursor_details as

member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is
l_result ut_cursor_details := self;
l_column_tab ut_cursor_column_tab := ut_cursor_column_tab();
l_column ut_cursor_column;
c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)';
begin
if l_result.cursor_columns_info is not null then
Expand Down Expand Up @@ -194,6 +196,24 @@ create or replace type body ut_cursor_details as
select 1 from excluded_columns f where regexp_like( '/'||x.access_path, '^/?'||f.col_names||'($|/.*)' )
);
end if;

--Rewrite column order after columns been excluded
for i in (
select parent_name, access_path, display_path, has_nested_col,
transformed_name, hierarchy_level,
rownum as new_position, xml_valid_name,
column_name, column_type, column_type_name, column_schema,
column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info
from table(l_result.cursor_columns_info) x
order by x.column_position asc
) loop
l_column := i.col_info;
l_column.column_position := i.new_position;
l_column_tab.extend;
l_column_tab(l_column_tab.last) := l_column;
end loop;

l_result.cursor_columns_info := l_column_tab;
self := l_result;
end if;
end;
Expand Down
12 changes: 12 additions & 0 deletions test/ut3_user/expectations/test_expectations_cursor.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2831,5 +2831,17 @@ Check the query and data for errors.';
$end
end;

procedure uc_columns_exclude is
v_actual SYS_REFCURSOR;
v_expected SYS_REFCURSOR;
begin
open v_expected for
select to_Char(null) id, 'ok' name from dual;
open v_actual for
select 'ok' name, to_number(null) id from dual;

ut3.ut.expect(v_actual).to_equal(v_expected).exclude('ID');
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
end;
/
3 changes: 3 additions & 0 deletions test/ut3_user/expectations/test_expectations_cursor.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,5 +459,8 @@ create or replace package test_expectations_cursor is

type t_num_tab is table of t_num_rec index by binary_integer;

--%test( Mixed column order exclusion )
procedure uc_columns_exclude;

end;
/