Fixing SONAR errors

lwasylow · lwasylow · commit b91ea69809e6 · 2019-03-06T23:19:46.000Z
diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb
@@ -25,9 +25,6 @@ create or replace package body ut_metadata as
   procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2, a_procedure_name in out nocopy varchar2) is
     l_name          varchar2(200);
     l_context       integer := 1; --plsql
-    l_dblink        varchar2(200);
-    l_part1_type    number;
-    l_object_number number;
   begin
     l_name := form_name(a_owner, a_object, a_procedure_name);
     do_resolve(l_name,l_context,a_owner,a_object, a_procedure_name);
@@ -292,17 +289,12 @@ create or replace package body ut_metadata as
   
   function has_collection_members (a_anydata in anydata) return boolean is
     l_anytype anytype;
-    l_nested_type   t_anytype_members_rec;
     l_elements_rec  t_anytype_elem_info_rec;
     l_type_code integer;
   begin
     l_type_code := a_anydata.gettype(l_anytype);
     l_elements_rec := get_attr_elem_info(l_anytype);
-    if l_elements_rec.attr_elt_type is null then
-      return false;
-    else 
-      return true;
-    end if;
+    return l_elements_rec.attr_elt_type is not null;
   end;
 
   function get_anydata_typename(a_data_value anydata) return varchar2
@@ -333,9 +325,9 @@ create or replace package body ut_metadata as
   end; 
     
   function get_object_name(a_full_object_name in varchar2) return varchar2 is
-    l_schema varchar(250);
-    l_object varchar(250);
-    l_procedure_name varchar(250);
+    l_schema varchar2(250);
+    l_object varchar2(250);
+    l_procedure_name varchar2(250);
   begin
     ut_metadata.do_resolve(a_full_object_name,7,l_schema,l_object, l_procedure_name);
     return l_object;
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -91,6 +91,8 @@ create or replace package body ut_compound_data_helper is
               || case when a_order_enforced then ',
                    row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn,
                    row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn'
+                else
+                  null
                 end ||q'[
               from expected_cols e
               full outer join actual_cols a
@@ -112,6 +114,8 @@ create or replace package body ut_compound_data_helper is
               || case when a_order_enforced then q'[
               --column position is not matching (both when excluded extra/missing columns as well as when they are included)
               or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]'
+              else
+                null
               end ||q'[
            order by exp_col_pos, act_col_pos]'
       bulk collect into l_results using a_expected, a_actual;
@@ -312,7 +316,6 @@ create or replace package body ut_compound_data_helper is
     l_xmltable_stmt  clob;
     l_select_stmt    clob;
     l_partition_stmt clob;
-    l_equal_stmt     clob;
     l_join_on_stmt   clob;
     l_not_equal_stmt clob;
     l_where_stmt     clob;
@@ -356,10 +359,8 @@ create or replace package body ut_compound_data_helper is
     l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated));
     l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt);
 
-    if l_not_equal_stmt is not null then
-      if (a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered) then
+    if l_not_equal_stmt is not null and ((a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then
         ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or ');
-      end if;
     end if;
     --If its inclusion we expect a actual set to fully match and have no extra elements over expected
     if a_inclusion_type then
@@ -499,6 +500,8 @@ create or replace package body ut_compound_data_helper is
          case when final_order = 1 then to_char(rn) else col_name end,
          case when final_order = 1 then to_char(rnk) else col_name end
      ]'
+   else
+     null
    end;
    execute immediate l_sql
    bulk collect into l_results
