Tidy up code

lwasylow · lwasylow · commit 45643e094b45 · 2018-12-13T10:35:11.000Z
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -114,6 +114,10 @@ create or replace package ut_utils authid definer is
   gc_invalid_package constant pls_integer := -6550;
   pragma exception_init(ex_invalid_package, -6550);
 
+  ex_failure_for_all exception;
+  gc_failure_for_all constant pls_integer := -24381;
+  pragma exception_init (ex_failure_for_all, -24381);
+
   gc_max_storage_varchar2_len constant integer := 4000;
   gc_max_output_string_length constant integer := 4000;
   gc_max_input_string_length  constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -17,7 +17,7 @@ create or replace package body ut_compound_data_helper is
   */
 
   g_diff_count        integer;
-
+  gc_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)';
   type t_type_name_map is table of varchar2(128) index by binary_integer;
   g_type_name_map           t_type_name_map;
   g_anytype_name_map        t_type_name_map;
@@ -46,8 +46,6 @@ create or replace package body ut_compound_data_helper is
     
   function get_columns_diff_ordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) 
   return tt_column_diffs is
-    l_column_filter  varchar2(32767);
-    l_sql            varchar2(32767);
     l_results        tt_column_diffs;
   begin
     with 
@@ -87,8 +85,6 @@ create or replace package body ut_compound_data_helper is
   
   function get_columns_diff_unordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) 
   return tt_column_diffs is
-    l_column_filter  varchar2(32767);
-    l_sql            varchar2(32767);
     l_results        tt_column_diffs;
   begin
     with 
@@ -125,11 +121,11 @@ create or replace package body ut_compound_data_helper is
   function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false) 
   return tt_column_diffs is
   begin
-    if a_order_enforced then
-      return get_columns_diff_ordered(a_expected,a_actual);
-    else 
-      return get_columns_diff_unordered(a_expected,a_actual);
-    end if;
+    return
+    case
+      when a_order_enforced then get_columns_diff_ordered(a_expected,a_actual)
+      else get_columns_diff_unordered(a_expected,a_actual)
+    end;
   end;
   
   function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob is
@@ -139,8 +135,10 @@ create or replace package body ut_compound_data_helper is
     return l_pk_value; 
   end; 
  
-  procedure generate_not_equal_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob,
-    a_col_name varchar2) is
+  procedure generate_not_equal_stmt(
+    a_data_info ut_cursor_column, a_pk_table ut_varchar2_list,
+    a_not_equal_stmt in out nocopy clob, a_col_name varchar2
+  ) is
     l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list());
     l_index integer;
     l_sql_stmt varchar2(32767);
@@ -164,8 +162,10 @@ create or replace package body ut_compound_data_helper is
     end if;  
   end;
    
-  procedure generate_join_by_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_join_by_stmt in out nocopy clob,
-    a_col_name varchar2) is
+  procedure generate_join_by_stmt(
+    a_data_info ut_cursor_column, a_pk_table ut_varchar2_list,
+    a_join_by_stmt in out nocopy clob, a_col_name varchar2
+  ) is
     l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list());
     l_index integer;
     l_sql_stmt varchar2(32767);
@@ -192,9 +192,10 @@ create or replace package body ut_compound_data_helper is
     ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt);
   end;
 
-  procedure generate_partition_stmt(a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob,
-    a_pk_table in ut_varchar2_list,a_col_name in varchar2,a_alias varchar2 := 'ucd.') is  
-    
+  procedure generate_partition_stmt(
+    a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob,
+    a_pk_table in ut_varchar2_list,a_col_name in varchar2,a_alias varchar2 := 'ucd.'
+  ) is
     l_alias varchar2(10) := a_alias;
     l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list());
     l_index integer;
@@ -284,16 +285,18 @@ create or replace package body ut_compound_data_helper is
          generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name);
          end if;
       end loop;
-      --Finish parition by 
+      --Finish partition by
       ut_utils.append_to_clob(a_partition_stmt,l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no ');    
     else
       --Partition by piece when no data
       ut_utils.append_to_clob(a_partition_stmt,', 1 dup_no ');
     end if;
   end;
   
-  procedure get_act_and_exp_set(a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob, 
-    a_xmltable_stmt clob, a_unordered boolean,a_type varchar2) is
+  procedure get_act_and_exp_set(
+    a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob,
+    a_xmltable_stmt clob, a_unordered boolean,a_type varchar2
+  ) is
     l_temp_string varchar2(32767);
     l_ut_owner       varchar2(250) := ut_utils.ut_owner;
   begin
@@ -409,7 +412,8 @@ create or replace package body ut_compound_data_helper is
     return l_column_list;
   end;
   
-  function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, 
+  function get_rows_diff_by_sql(
+    a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab,
     a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw,
     a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false
   ) return tt_row_diffs is
@@ -601,14 +605,17 @@ create or replace package body ut_compound_data_helper is
 
   procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is
   begin  
-    forall idx in 1..a_diff_tab.count
+    forall idx in 1..a_diff_tab.count save exceptions
     insert into ut_compound_data_diff_tmp
     ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no )
     values 
     (a_diff_id, 
     xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id,
     xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id,
     a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no);
+  exception
+    when ut_utils.ex_failure_for_all then
+      raise_application_error(ut_utils.gc_failure_for_all,'Failure to insert a diff tmp data.');
   end;
   
   procedure set_rows_diff(a_rows_diff integer) is
@@ -651,7 +658,8 @@ create or replace package body ut_compound_data_helper is
    return l_result;
   end;
  
-  function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list) return ut_varchar2_list is
+  function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list)
+  return ut_varchar2_list is
     l_result ut_varchar2_list := ut_varchar2_list();
   begin 
    select fl.column_value
@@ -689,20 +697,20 @@ create or replace package body ut_compound_data_helper is
     if a_include_xpath.count > 0 and a_exclude_xpath.count > 0 then
       select col_names bulk collect into l_filtered_set
       from(
-        select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names
+        select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names
         from table(a_include_xpath)
         minus
-        select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names
+        select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names
         from table(a_exclude_xpath)
        );
        l_include := true;
     elsif a_include_xpath.count > 0 and a_exclude_xpath.count = 0 then
-      select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names
+      select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names
       bulk collect into l_filtered_set
       from table(a_include_xpath);
       l_include := true;
     elsif a_include_xpath.count = 0 and a_exclude_xpath.count > 0 then
-      select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names
+      select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names
       bulk collect into l_filtered_set
       from table(a_exclude_xpath);
       l_include := false;
@@ -719,15 +727,17 @@ create or replace package body ut_compound_data_helper is
     return l_result;
   end;
   
-  function contains_collection (a_cursor_info ut_cursor_column_tab) return number is
+  function contains_collection (a_cursor_info ut_cursor_column_tab)
+  return number is
     l_collection_elements number;
   begin
     select count(1) into l_collection_elements from
     table(a_cursor_info) c where c.is_collection = 1;
     return l_collection_elements;
   end;
   
-  function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab is
+  function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list)
+  return ut_cursor_column_tab is
     l_result ut_cursor_column_tab;
   begin
     select ut_cursor_column(i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position ,
@@ -742,41 +752,49 @@ create or replace package body ut_compound_data_helper is
   end;
  
   function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab)
-      return xmltype is
-      l_result xmltype;
-    begin
-       select xmlagg(xmlelement(evalname t.column_name,t.column_type,
-                                           getxmlchildren(t.column_name,a_cursor_table)))
-         into l_result
-        from table(a_cursor_table) t
-       where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null)
-          or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null)
-       having count(*) > 0;
-
+  return xmltype is
+    l_result xmltype;
+  begin
+    select xmlagg(xmlelement(evalname t.column_name,t.column_type,
+                                      getxmlchildren(t.column_name,a_cursor_table)))
+    into l_result
+    from table(a_cursor_table) t
+    where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null)
+      or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null)
+    having count(*) > 0;
 
-      return l_result;
-   end;     
+    return l_result;
+  end;
 
-  function is_sql_compare_allowed(a_type_name varchar2) return boolean is
+  function is_sql_compare_allowed(a_type_name varchar2)
+  return boolean is
+    l_assert boolean;
   begin
     --clob/blob/xmltype/object/nestedcursor/nestedtable
     if a_type_name IN (g_type_name_map(dbms_sql.blob_type),
                        g_type_name_map(dbms_sql.clob_type),
                        g_type_name_map(dbms_sql.bfile_type),
                        g_anytype_name_map(dbms_types.typecode_namedcollection))
     then    
-      return false;
+      l_assert := false;
     else
-      return true;
+      l_assert := true;
     end if;
+    return l_assert;
   end;
 
-  function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is
+  function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean)
+  return varchar2 is
   begin
-   return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end;
+   return
+     case
+       when a_dbms_sql_desc then g_type_name_map(a_type_code)
+       else g_anytype_name_map(a_type_code)
+     end;
   end;
 
-  function get_anytype_members_info( a_anytype anytype ) return t_anytype_members_rec is
+  function get_anytype_members_info( a_anytype anytype )
+  return t_anytype_members_rec is
     l_result  t_anytype_members_rec;
   begin
     if a_anytype is not null then
@@ -795,7 +813,8 @@ create or replace package body ut_compound_data_helper is
     return l_result;
   end;
 
-  function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) return t_anytype_elem_info_rec is
+  function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null )
+  return t_anytype_elem_info_rec is
     l_result  t_anytype_elem_info_rec;
   begin
     if a_anytype is not null then
diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks
@@ -99,7 +99,8 @@ create or replace package ut_compound_data_helper authid definer is
     a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2
   ) return tt_row_diffs;
 
-  function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, 
+  function get_rows_diff_by_sql(
+    a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab,
     a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw,
     a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false
   ) return tt_row_diffs;
diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -16,7 +16,8 @@ create or replace type body ut_data_value_refcursor as
   limitations under the License.
   */
         
-  constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result is
+  constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor)
+  return self as result is
   begin
     init(a_value);
     return;
@@ -122,7 +123,9 @@ create or replace type body ut_data_value_refcursor as
     return l_result_string;
   end;
 
-  member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2 is
+  member function diff(
+    a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()
+  ) return varchar2 is
     l_result            clob;
     l_results           ut_utils.t_clob_tab := ut_utils.t_clob_tab();
     l_result_string     varchar2(32767);
@@ -170,7 +173,9 @@ create or replace type body ut_data_value_refcursor as
      return l_message;
     end;
     
-    function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs) return ut_cursor_column_tab is
+    function remove_incomparable_cols(
+      a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs
+    ) return ut_cursor_column_tab is
       l_incomparable_cols ut_varchar2_list := ut_varchar2_list();
       l_filter_out ut_cursor_column_tab;
     begin
@@ -186,7 +191,6 @@ create or replace type body ut_data_value_refcursor as
     
     function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is
     begin
-
       if a_is_unordered then     
         if a_row_diff.pk_value is not null then
           return  '  PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row;
