Updates to include nested an collections

lwasylow · lwasylow · commit e4043b5cc95d · 2018-11-19T07:14:28.000Z
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -543,7 +543,7 @@ create or replace package body ut_compound_data_helper is
       --TODO : Collection is intersting exmaple that we probably has to extract full xml and hash it.
       ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by ');
       for i in 1..l_cursor_info.count loop
-        if l_cursor_info(i).is_user_defined = 0 then
+        if l_cursor_info(i).has_nested_col = 0 then
         l_col_name := case when l_cursor_info(i).parent_name is null then 
                          l_cursor_info(i).xml_valid_name
                         else 
@@ -690,7 +690,6 @@ create or replace package body ut_compound_data_helper is
    end if;
    ut_utils.append_to_clob(l_compare_sql,l_temp_string);
     
-   --dbms_output.put_line(l_compare_sql);
    return l_compare_sql;
   end;
  
diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb
@@ -23,10 +23,15 @@ create or replace type body ut_cursor_column as
       self.xml_valid_name  := '"'||self.column_name||'"';
       self.column_type     := a_col_type;
       self.column_schema   := a_col_schema_name;
-      self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type));
+      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))
+                              end;
+      --TODO : Part of the constructor same as has nested ??
       self.is_collection   := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_collection(a_col_schema_name,a_col_type_name));
       --TODO : fix that as is nasty hardcode
-      self.is_user_defined := case when lower(self.column_type) = 'user_defined_type' then 1 else 0 end;
+      self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end;
    end;
    
    constructor function ut_cursor_column( self in out nocopy ut_cursor_column,
diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps
@@ -2,6 +2,7 @@ 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,
@@ -15,7 +16,6 @@ create or replace type ut_cursor_column force authid current_user as object
    column_scale    integer,
    is_sql_diffable number(1, 0),
    is_collection   number(1, 0),
-   is_user_defined 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/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb
@@ -1542,9 +1542,9 @@ Diff:%
     ut3.ut.expect(l_actual).to_equal(l_expected).unordered;
  l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ]%
 Diff:%
-Rows: [ 5 differences 1
-%Extra:    <COLVAL><ID>1</ID><name>Something 1</name><Value>1</Value></COLVAL>%
+Rows: [ 5 differences%
 %Extra:    <COLVAL><ID>2</ID><name>Something 2</name><Value>2</Value></COLVAL>%
+%Extra:    <COLVAL><ID>1</ID><name>Something 1</name><Value>1</Value></COLVAL>%
 %Missing:  <COLVAL><ID>1</ID><name>Somethings 1</name><Value>1</Value></COLVAL>%
 %Missing:  <COLVAL><ID>2</ID><name>Somethings 2</name><Value>2</Value></COLVAL>%
 %Missing:  <COLVAL><ID>3</ID><name>Somethings 3</name><Value>3</Value></COLVAL>%]';
