remove schema quantifier

Changes to remove xpath from diff rows. Signed-off-by: lwasylow <[email protected]>
utPLSQL · jgebal · Mar 15, 2019 · Oct 6, 2018 · Oct 6, 2018 · Oct 6, 2018
commit 2b90c4b2f3aa9fb34715c75e526839df2799493c
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -692,5 +692,10 @@ create or replace package body ut_utils is
     return l_result;
   end;
 
+  function serialize_data (a_data clob) return clob is
+  begin
+    return replace(a_data,chr(10));    
+  end;
+
 end ut_utils;
 /
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -354,5 +354,8 @@ create or replace package ut_utils authid definer is
   */
   function replace_multiline_comments(a_source clob) return clob;
 
+  --TODO optimize clob replace to be more efficient as might not work replace on large clobs
+  function serialize_data (a_data clob) return clob;
+
 end ut_utils;
 /
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks
@@ -58,6 +58,7 @@ create or replace package ut_compound_data_helper authid definer is
 
   type t_diff_tab is table of t_diff_rec;
 
+
   function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype;
 
   function get_columns_filter(
@@ -72,10 +73,14 @@ create or replace package ut_compound_data_helper authid definer is
 
  function get_rows_diff(
     a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw,
-    a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2,
-    a_join_by_xpath varchar2,a_refcursor boolean, a_unordered boolean
+    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, 
+    a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw,
+    a_join_by_list ut_varchar2_list, a_unordered boolean
+  ) return tt_row_diffs;
+
   subtype t_hash  is raw(128);
 
   function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1)  return t_hash;
@@ -111,12 +116,16 @@ create or replace package ut_compound_data_helper authid definer is
   function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) 
   return tt_missing_pk;
 
+  function validate_attributes(a_cursor_info ut_cursor_column_tab, a_filter_list ut_varchar2_list) return ut_varchar2_list;
+
   function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list)  
   return ut_cursor_column_tab;
 
   function contains_collection (a_cursor_info ut_cursor_column_tab) return number;
 
   function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab;
 
+  function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2;
+
 end;
 /
diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb
@@ -118,14 +118,13 @@ create or replace type body ut_compound_data_value as
     dbms_lob.createtemporary(l_result,true);
 
     l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id);
-
     -- First tell how many rows are different
     l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; 
     --TODO : Change message when the types not matching
     if l_diff_row_count > 0  then
       l_row_diffs := ut_compound_data_helper.get_rows_diff(
             self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, 
-            a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered);
+            a_include_xpath);
       l_message := chr(10)
                    ||'Rows: [ ' || l_diff_row_count ||' differences'
                    ||  case when  l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end

diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb
@@ -6,24 +6,24 @@ create or replace type body ut_cursor_column as
      a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1,
      a_col_position integer, a_col_type varchar2, a_collection integer) is
    begin
-      self.parent_name     := a_parent_name;
-      self.hierarchy_level := a_hierarchy_level;
-      self.column_position := a_col_position;
-      self.column_prec     := a_col_prec;
-      self.column_len      := a_col_max_len;
-      self.column_scale    := a_col_scale;
-      self.column_name     := TRIM( BOTH '''' FROM a_col_name);
+      self.parent_name      := a_parent_name;
+      self.hierarchy_level  := a_hierarchy_level;
+      self.column_position  := a_col_position;
+      self.column_prec      := a_col_prec;
+      self.column_len       := a_col_max_len;
+      self.column_scale     := a_col_scale;
+      self.column_name      := TRIM( BOTH '''' FROM a_col_name);
       self.column_type_name := a_col_type_name;
-      self.access_path     := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end;
-      self.nested_name     := case when self.parent_name is null then 
-                                null
+      self.access_path      := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end;
+      self.xml_valid_name   := '"'||self.column_name||'"';
+      self.transformed_name := case when self.parent_name is null then 
+                                self.xml_valid_name
                              else 
                                 '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"'
                              end;
-      self.xml_valid_name  := '"'||self.column_name||'"';
-      self.column_type     := a_col_type;
-      self.column_schema   := a_col_schema_name;
-      self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then 
+      self.column_type      := a_col_type;
+      self.column_schema    := a_col_schema_name;
+      self.is_sql_diffable  := case when lower(self.column_type) = 'user_defined_type' then 
                                 0 
                               else 
                                 ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type))

diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps
@@ -1,21 +1,21 @@
 create or replace type ut_cursor_column force authid current_user as object
 (
-   parent_name     varchar2(100),
-   access_path     varchar2(500),
-   has_nested_col  number(1,0),
-   nested_name     varchar2(32),
-   hierarchy_level number,
-   column_position number,
-   xml_valid_name  varchar2(100),
-   column_name     varchar2(100),
-   column_type     varchar2(100),
+   parent_name      varchar2(100),
+   access_path      varchar2(500),
+   has_nested_col   number(1,0),
+   transformed_name varchar2(32),
+   hierarchy_level  number,
+   column_position  number,
+   xml_valid_name   varchar2(100),
+   column_name      varchar2(100),
+   column_type      varchar2(100),
    column_type_name varchar2(100),
-   column_schema   varchar2(100),
-   column_prec     integer,
-   column_len      integer,
-   column_scale    integer,
-   is_sql_diffable number(1, 0),
-   is_collection   number(1, 0),
+   column_schema    varchar2(100),
+   column_prec      integer,
+   column_len       integer,
+   column_scale     integer,
+   is_sql_diffable  number(1, 0),
+   is_collection    number(1, 0),
 
    member procedure init(self in out nocopy ut_cursor_column,
      a_col_name varchar2, a_col_schema_name varchar2,

diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -116,71 +116,7 @@ create or replace type body ut_data_value_refcursor as
     return l_result_string;
   end;
 
-  member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, 
-                                a_join_by_xpath varchar2, a_unordered boolean,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return clob is
-    c_max_rows          integer := ut_utils.gc_diff_max_rows;
-    l_result            clob;
-    l_results           ut_utils.t_clob_tab := ut_utils.t_clob_tab();
-    l_message           varchar2(32767);
-    l_ut_owner          varchar2(250) := ut_utils.ut_owner;
-    l_diff_row_count    integer;
-    l_actual            ut_compound_data_value;
-    l_diff_id           ut_compound_data_helper.t_hash;
-    l_row_diffs         ut_compound_data_helper.tt_row_diffs;
-    l_compare_type      varchar2(10);
-    l_self              ut_compound_data_value;
-
-    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;
-        else
-          return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row;
-        end if;
-      else
-        return '  Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row;
-      end if; 
-    end;
-
-  begin
-    if not a_other is of (ut_compound_data_value) then
-      raise value_error;
-    end if; 
-
-    l_actual := treat(a_other as ut_compound_data_value);
-
-    dbms_lob.createtemporary(l_result,true);
-
-    l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id);
-
-    -- First tell how many rows are different
-    l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; 
-    --TODO : Change message when the types not matching
-    if l_diff_row_count > 0  then
-      l_row_diffs := ut_compound_data_helper.get_rows_diff(
-            self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, 
-            a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered);
-      l_message := chr(10)
-                   ||'Rows: [ ' || l_diff_row_count ||' differences'
-                   ||  case when  l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end
-                   ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then '  All rows are different as the columns are not matching.' else null end;
-      ut_utils.append_to_clob( l_result, l_message );
-      for i in 1 .. l_row_diffs.count loop
-        l_results.extend;
-        l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered);
-      end loop;
-      ut_utils.append_to_clob(l_result,l_results);
-    else
-      l_message:= chr(10)||'Rows: [  all different ]'||chr(10)||'  All rows are different as the columns are not matching.';
-      ut_utils.append_to_clob( l_result, l_message );
-    end if;
-    return l_result;
-  end;
-
-  member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, 
-    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);
@@ -293,9 +229,9 @@ create or replace type body ut_data_value_refcursor as
     l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; 
     l_results := ut_utils.t_clob_tab();
     if l_diff_row_count > 0  then
-        l_row_diffs := ut_compound_data_helper.get_rows_diff(
-              self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, 
-              a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered);
+        --TODO : since columns can differ we need to pass both list or get common denominator
+        l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql(
+              l_exp_cols,l_act_cols, self.data_id, l_actual.data_id, l_diff_id,a_join_by_list , a_unordered);
         l_message := chr(10)
                      ||'Rows: [ ' || l_diff_row_count ||' differences'
                      ||  case when  l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end
@@ -329,21 +265,19 @@ create or replace type body ut_data_value_refcursor as
     return l_result_string;
   end;
 
-  overriding member function compare_implementation (a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, 
-                                          a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) 
-                                          return integer is
+  overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, 
+                                         a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer is
     l_result          integer := 0;
     l_actual          ut_data_value_refcursor;
-
     l_pk_missing_tab ut_compound_data_helper.tt_missing_pk;
 
   begin
     if not a_other is of (ut_data_value_refcursor) then
       raise value_error;
     end if;
-
+  
     l_actual   := treat(a_other as ut_data_value_refcursor);
-
+     
     if a_join_by_list.count > 0 then
       l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list);
       l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end;
@@ -365,9 +299,9 @@ create or replace type body ut_data_value_refcursor as
     return self.elements_count = 0;
   end;
 
- member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is
+  member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is
     l_result ut_data_value_refcursor := self;
-  begin
+  begin   
     if l_result.cursor_details.cursor_info is not null then
       l_result.cursor_details.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_info,a_exclude_xpath,a_include_xpath);
     end if;    

diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps
@@ -52,13 +52,9 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value(
   constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result,
   member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor),
   overriding member function to_string return varchar2,
-  member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, 
-                                a_join_by_xpath varchar2, a_unordered boolean,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return clob,
-  member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false
-                                  ,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return varchar2,
-  overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, 
-                                                    a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer,
+  member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2,
+  overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, 
+                                         a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer,
   overriding member function is_empty return boolean,
-  member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor
-)
+  member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor)
 /
diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb
@@ -255,7 +255,6 @@ create or replace type body ut_equal as
 
   member function get_join_by_list return ut_varchar2_list is
   begin
-    --TODO : zamiast zmieniac path zmodyfikuj get functions
     return ( coalesce(join_columns, ut_varchar2_list()) );
   end;
 
@@ -268,8 +267,7 @@ create or replace type body ut_equal as
         l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath());
       elsif self.expected is of (ut_data_value_refcursor) then
         l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list);
-        l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, 
-                               get_unordered(), false, false, get_join_by_list() );
+        l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, get_unordered(), false, false, get_join_by_list() );
       else
         l_result := equal_with_nulls((self.expected = a_actual), a_actual);
       end if;
@@ -289,7 +287,7 @@ create or replace type body ut_equal as
         l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list);
         l_result :=
           'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info()
-          || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).diff(l_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered(),get_join_by_list());      
+          || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).filter_cursor(exclude_list, include_list).diff(l_actual, get_unordered(),get_join_by_list());      
       else
         l_result :=
           'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info()

diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb
@@ -78,7 +78,7 @@ create or replace type body ut_include as
         l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list);
         l_result :=
           'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info()
-          || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true);      
+          || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(l_actual, true, self.get_join_by_list());     
       else
         l_result :=
           'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info()