Merge pull request #913 from utPLSQL/fix/exclude_column_position

jgebal · web-flow · commit 0b0e6d13bf94 · 2019-05-10T18:11:41.000+01:00
Fix/exclude column position
diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb
@@ -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
@@ -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;
diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb
@@ -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;
 /
diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks
@@ -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;
 /

Original file line number	Diff line number	Diff line change
`@@ -459,5 +459,8 @@ create or replace package test_expectations_cursor is`
`459`	`459`
`460`	`460`	`type t_num_tab is table of t_num_rec index by binary_integer;`
`461`	`461`
	`462`	`+ --%test( Mixed column order exclusion )`
	`463`	`+ procedure uc_columns_exclude;`
	`464`	`+`
`462`	`465`	`end;`
`463`	`466`	`/`