Added failure on missing join by key in cursor.

lwasylow · lwasylow · commit ac042d05403f · 2018-05-10T18:00:23.000+01:00
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -464,6 +464,48 @@ create or replace package body ut_compound_data_helper is
     return l_cols_hash;
   end;
 
+  function is_pk_exists(a_expected_cursor xmltype,a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) 
+  return tt_missing_pk is
+    l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list();
+    l_column_filter  varchar2(32767);
+    l_no_missing_keys tt_missing_pk := tt_missing_pk();
+  begin
+    if a_join_by_xpath is not null then
+      l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|');
+      l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath);
+    
+      execute immediate q'[
+      with  xpaths_tab as (select column_value  xpath from table(:xpath_tabs)),
+        expected_column_info as ( select :expected as item_data from dual ),
+        actual_column_info as ( select :actual as item_data from dual ) 
+        select xpath,diif_type from
+        (
+         (select xpath,'e' diif_type from xpaths_tab
+         minus
+         select xpath,'e' diif_type
+         from   ( select ]'||l_column_filter||q'[ from expected_column_info ucd) x
+         ,xpaths_tab
+         where xmlexists (xpaths_tab.xpath passing x.item_data)
+         )
+         union all
+         (select xpath,'a' diif_type from xpaths_tab
+         minus
+         select xpath,'a' diif_type
+         from   ( select ]'||l_column_filter||q'[ from actual_column_info ucd) x
+         ,xpaths_tab
+         where xmlexists (xpaths_tab.xpath passing x.item_data)
+         )       
+         )]' bulk collect into l_no_missing_keys 
+         using l_pk_xpath_tabs,a_expected_cursor,a_actual_cursor,
+         a_exclude_xpath, a_include_xpath,
+         a_exclude_xpath, a_include_xpath; 
+    
+    end if;
+    
+    return l_no_missing_keys;
+  end;
+ 
+
 begin
   g_type_name_map( dbms_sql.binary_bouble_type )           := 'BINARY_DOUBLE';
   g_type_name_map( dbms_sql.bfile_type )                   := 'BFILE';
diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks
@@ -28,6 +28,13 @@ create or replace package ut_compound_data_helper authid definer is
 
   type tt_column_diffs is table of t_column_diffs;
 
+  type t_missing_pk is record(
+    missingxpath  varchar2(250),
+    diff_type     varchar2(1)
+  );
+
+  type tt_missing_pk is table of t_missing_pk;
+  
   type t_row_diffs is record(
     rn            integer,
     diff_type     varchar2(250),
@@ -72,6 +79,9 @@ create or replace package ut_compound_data_helper authid definer is
     a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2,
     a_hash_type binary_integer := dbms_crypto.hash_sh1
   ) return t_hash;
+  
+  function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) 
+  return tt_missing_pk;
 
 end;
 /
diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -115,7 +115,8 @@ create or replace type body ut_data_value_refcursor as
     l_actual            ut_data_value_refcursor;
     l_column_diffs      ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs();
     l_exclude_xpath     varchar2(32767) := a_exclude_xpath;
-
+    l_missing_pk        ut_compound_data_helper.tt_missing_pk := ut_compound_data_helper.tt_missing_pk();
+    
     function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is
     begin
       return
@@ -130,7 +131,18 @@ create or replace type body ut_data_value_refcursor as
             '  Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.'
         end;
     end;
-
+    
+    function get_missing_key_message(a_missing_keys ut_compound_data_helper.t_missing_pk) return varchar2 is
+    begin
+     return
+       case a_missing_keys.diff_type
+         when 'a' then
+           '  Unknown key to join by in actual:'||a_missing_keys.missingxpath
+         when 'e' then
+           '  Unknown key to join by in expected:'||a_missing_keys.missingxpath
+      end; 
+    end;
+    
     function add_incomparable_cols_to_xpath(
       a_column_diffs ut_compound_data_helper.tt_column_diffs, a_exclude_xpath varchar2
     ) return varchar2 is
@@ -151,6 +163,7 @@ create or replace type body ut_data_value_refcursor as
       end if;
       return l_result;
     end;
+    
   begin
     if not a_other is of (ut_data_value_refcursor) then
       raise value_error;
@@ -176,12 +189,20 @@ create or replace type body ut_data_value_refcursor as
     end if;
 
     --diff rows and row elements
-    if a_join_by_xpath is not null then
-      ut_utils.append_to_clob(l_result, self.get_data_diff(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath));
-    elsif a_unordered then
-      ut_utils.append_to_clob(l_result, self.get_data_diff(a_other, l_exclude_xpath, a_include_xpath, a_unordered));
+    if (a_join_by_xpath is not null) or not(a_unordered) then
+      -- Check if pk filter exists
+      l_missing_pk := ut_compound_data_helper.is_pk_exists(self.columns_info, l_actual.columns_info, a_exclude_xpath, a_include_xpath,a_join_by_xpath); 
+      if l_missing_pk.count = 0 then
+        ut_utils.append_to_clob(l_result, self.get_data_diff(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath));    
+      else
+        ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10));
+        for i in 1 .. l_missing_pk.count loop
+          l_results.extend;
+          ut_utils.append_to_clob(l_result, get_missing_key_message(l_missing_pk(i)));
+        end loop;    
+      end if;
     else
-      ut_utils.append_to_clob(l_result, self.get_data_diff(a_other, l_exclude_xpath, a_include_xpath, a_join_by_xpath));
+      ut_utils.append_to_clob(l_result, self.get_data_diff(a_other, l_exclude_xpath, a_include_xpath, a_unordered));
     end if;
     
     l_result_string := ut_utils.to_string(l_result,null);
@@ -211,19 +232,29 @@ create or replace type body ut_data_value_refcursor as
   overriding member function compare_implementation (a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return integer is
     l_result          integer := 0;
     l_other           ut_data_value_refcursor;
+    l_missing_pk      ut_compound_data_helper.tt_missing_pk :=  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_other   := treat(a_other as ut_data_value_refcursor);
+    
+    l_missing_pk := ut_compound_data_helper.is_pk_exists(self.columns_info, l_other.columns_info, a_exclude_xpath, a_include_xpath,a_join_by_xpath);
+    --if we join by key and key is missing fail and report error
+     if a_join_by_xpath is not null and l_missing_pk.count > 0 then 
+      l_result := 1;
+      return l_result;
+    end if;
+    
     --if column names/types are not equal - build a diff of column names and types
     if ut_compound_data_helper.columns_hash( self, a_exclude_xpath, a_include_xpath )
        != ut_compound_data_helper.columns_hash( l_other, a_exclude_xpath, a_include_xpath )
     then
       l_result := 1;
     end if;
-    l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_unordered);
+    
+      l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_unordered);
     return l_result;
   end;
 
