Check in progress of working version.

lwasylow · lwasylow · commit b4113fd13e71 · 2018-11-06T07:42:02.000Z
Still to define include and exclude.
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -49,6 +49,7 @@ create or replace package body ut_runner is
     ut_metadata.reset_source_definition_cache;
     ut_utils.read_cache_to_dbms_output();
     ut_coverage_helper.cleanup_tmp_table();
+    ut_compound_data_helper.cleanup_diff();
   end;
 
 
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -17,6 +17,7 @@ create or replace package body ut_compound_data_helper is
   */
 
   g_user_defined_type pls_integer := dbms_sql.user_defined_type;
+  gc_diff_count       integer;
   
   function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype is
     l_result varchar2(4000);
@@ -822,7 +823,7 @@ create or replace package body ut_compound_data_helper is
           where not exists (select 1 from pk_names p where lower(p.name) = lower(xt.name))
                          )
     loop
-      l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' a.'||i.name||q'[ <> ]'||' e.'||i.name;
+      l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' (decode(a.'||i.name||','||' e.'||i.name||',1,0) = 0)';
     end loop;
     return l_sql_stmt;
   end; 
@@ -872,5 +873,20 @@ create or replace package body ut_compound_data_helper is
     (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);         
   end;
   
+  procedure set_rows_diff(a_rows_diff integer) is
+  begin
+    gc_diff_count := a_rows_diff;
+  end;
+  
+  procedure cleanup_diff is
+  begin
+    gc_diff_count := 0;
+  end;
+  
+  function get_rows_diff return integer is
+  begin
+    return gc_diff_count;
+  end;
+  
 end;
 /
diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks
@@ -108,5 +108,11 @@ create or replace package ut_compound_data_helper authid definer is
   
   procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw);
   
+  procedure set_rows_diff(a_rows_diff integer);
+  
+  procedure cleanup_diff;
+  
+  function get_rows_diff return integer;
+  
 end;
 /
diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb
@@ -121,15 +121,21 @@ create or replace type body ut_compound_data_value as
     l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id);
     
     -- First tell how many rows are different
-    execute immediate 'select count('
+    
+    --REDO that is a bit mess ??
+    if l_is_sql_diff = 1 then
+      l_diff_row_count := ut_compound_data_helper.get_rows_diff;
+    else
+      execute immediate 'select count('
                       ||case when ( a_join_by_xpath is not null and l_is_sql_diff = 0 ) 
                           then 'distinct pk_hash' 
                           else '*' 
                         end
                       ||') from '|| l_ut_owner || '.ut_compound_data_diff_tmp '
                       ||'where diff_id = :diff_id' 
                       into l_diff_row_count using l_diff_id;
-                      
+    end if;                  
+    
     if l_diff_row_count > 0  then
       l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered, l_is_sql_diff);
       l_row_diffs := ut_compound_data_helper.get_rows_diff(
@@ -324,21 +330,14 @@ create or replace type body ut_compound_data_value as
                                         end
                                       ||'( a.data_id is null or e.data_id is null )';
    end if;
-
-    l_exec_sql := 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp '
-                  ||'( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no )'
-                  ||' select :diff_id, act_item_data, act_data_id,'
-                  ||' exp_item_data, exp_data_id , item_no '
-                  ||'from ( '|| l_compare_sql ||')';
    
    open l_loop_curs for l_compare_sql using  self.data_id,l_actual.data_id;
    
    loop
     fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows;
     exit when l_diff_tab.count = 0;
     --Pass it to helper as authid as definer
-    t1 := dbms_utility.get_time;
-    
+
     if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then
       ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id);     
     end if;
@@ -349,12 +348,10 @@ create or replace type body ut_compound_data_value as
       l_max_rows := ut_utils.gc_bc_fetch_limit;
     end if;
     
-    dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info , values'||l_sql_rowcount);
    end loop;
+    
+   ut_compound_data_helper.set_rows_diff(l_sql_rowcount);  
    
-   --l_actual.set_difference_count(l_sql_rowcount);
-   
-   --execute immediate l_exec_sql using l_diff_id, self.data_id,l_actual.data_id;
         --result is OK only if both are same
     if l_sql_rowcount = 0 and self.elements_count = l_other.elements_count then
       l_result := 0;
diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps
@@ -34,7 +34,7 @@ create or replace type ut_compound_data_value force under ut_data_value(
    * Holds unique id for retrieving the data from ut_compound_data_tmp temp table
    */
   data_id  raw(16),
-
+   
   overriding member function get_object_info return varchar2,
   overriding member function is_null return boolean,
   overriding member function is_diffable return boolean,
diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb
@@ -1087,13 +1087,13 @@ Rows: [ 2 differences ]%
     l_expected SYS_REFCURSOR;
   begin
     --Arrange
-    open l_actual for select owner, object_name,object_type from all_objects where owner = user
+    open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user
     order by 1,2,3 asc;
-    open l_expected for select owner, object_name,object_type from all_objects where owner = user
+    open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user
     order by 1,2,3 desc;
     
     --Act
-    ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER');
+    ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID');
     --Assert
     ut.expect(expectations.failed_expectations_data()).to_be_empty();
   end;
@@ -1109,7 +1109,7 @@ Rows: [ 2 differences ]%
     order by 1,2,3 desc;
     
     --Act
-    ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OWNER,OBJECT_NAME'));
+    ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_NAME,OBJECT_TYPE'));
     --Assert
     ut.expect(expectations.failed_expectations_data()).to_be_empty();
   end;
@@ -1257,10 +1257,10 @@ Diff:%
     l_expected SYS_REFCURSOR;
   begin
     --Arrange
-    open l_actual for select object_name from all_objects where rownum <=1100;
-    open l_expected for select object_name from all_objects where rownum <=1100;
+    open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level  <=1100;
+    open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level  <=1100;
     --Act
-    ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_NAME');
+    ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID');
     --Assert
     ut.expect(expectations.failed_expectations_data()).to_be_empty();
   end;
